update：更新编辑器

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/auto-complete.hbs

@@ -26,8 +26,11 @@
 {{#if item.psEditor.editorParams.sort}}
   sort="{{item.psEditor.editorParams.sort}}"
 {{/if}}
-{{#if item.psEditor.editorParams.open}}
-  :open="{{item.psEditor.editorParams.open}}"
+{{#if item.psEditor.editorParams.defaultOpen}}
+  :defaultOpen="{{item.psEditor.editorParams.defaultOpen}}"
+{{/if}}
+{{#if item.psEditor.editorParams.pickUpData}}
+  :pickUpData="{{item.psEditor.editorParams.pickUpData}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   disabled="{{item.psEditor.disabled}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/checkbox-list.hbs

@@ -4,8 +4,8 @@
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
-{{#if item.psEditor.isReadOnly}}
-  :readonly="{{item.psEditor.isReadOnly}}"
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
 {{#if item.psEditor.psAppCodeList}}
   codeListTag="{{item.psEditor.psAppCodeList.codeListTag}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/data-picker-view.hbs

@@ -21,8 +21,8 @@
 {{#if item.psEditor.psAppDEACMode.minorSortDir}}
   sort="{{item.psEditor.psAppDEACMode.minorSortDir}}"
 {{/if}}
-{{#if item.psEditor.pickUpData}}
-  pickUpData="{{item.psEditor.pickUpData}}"
+{{#if item.psEditor.editorParams.pickUpData}}
+  pickUpData="{{item.psEditor.editorParams.pickUpData}}"
 {{/if}}
 {{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
   :value="state.data.{{item.psEditor.name}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/data-picker.hbs

@@ -36,8 +36,8 @@
 {{#if item.psEditor.psAppDEACMode.minorSortDir}}
   sort="{{item.psEditor.psAppDEACMode.minorSortDir}}"
 {{/if}}
-{{#if item.psEditor.pickUpData}}
-  pickUpData="{{item.psEditor.pickUpData}}"
+{{#if item.psEditor.editorParams.pickUpData}}
+  pickUpData="{{item.psEditor.editorParams.pickUpData}}"
 {{/if}}
 {{#if (or (eq item.psEditor.editorType "PICKEREX_LINKONLY") (eq item.psEditor.editorType "PICKEREX_LINK"))}}
   :linkOnly="true"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/input.hbs

@@ -12,14 +12,14 @@
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-{{#if item.psEditor.editorParams.max}}
-  :max="{{item.psEditor.editorParams.max}}"
+{{#if item.psEditor.maxValue}}
+  :max="{{item.psEditor.maxValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.min}}
-  :max="{{item.psEditor.editorParams.min}}"
+{{#if item.psEditor.minValue}}
+  :min="{{item.psEditor.minValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.precision}}
-  :precision="{{item.psEditor.editorParams.precision}}"
+{{#if item.psEditor.precision}}
+  :precision="{{item.psEditor.precision}}"
 {{/if}}
 {{#if item.psEditor.maxLength}}
   :maxLength="{{item.psEditor.maxLength}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/list-box.hbs

@@ -20,8 +20,8 @@
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
-{{#if item.psEditor.isReadOnly}}
-  :readonly="{{item.psEditor.isReadOnly}}"
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
 {{#if item.psEditor.psAppCodeList}}
   codeListTag="{{item.psEditor.psAppCodeList.codeListTag}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/radio-group.hbs

@@ -9,8 +9,8 @@
 {{#eq ctrlType 'form'}}
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
-{{#if item.psEditor.isReadOnly}}
-  :readonly="{{item.psEditor.isReadOnly}}"
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
 {{#if item.psEditor.psNavigateContexts}}
   localContext="{{> @macro/front-end/common/navparam.hbs appNavParams=item.psEditor.psNavigateContexts}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/rating.hbs

@@ -6,8 +6,8 @@
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-{{#if item.psEditor.editorParams.max}}
-  :max="{{item.psEditor.editorParams.max}}"
+{{#if item.psEditor.maxValue}}
+  :max="{{item.psEditor.maxValue}}"
 {{/if}}
 {{#if item.psEditor.editorParams.allowHalf}}
   :allowHalf="{{item.psEditor.editorParams.allowHalf}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/raw.hbs

@@ -5,7 +5,9 @@
   :disabled="state.detailsModel.{{item.codeName}}.disabled"
 {{/eq}}
 {{#if item.psEditor.editorParams.contentType}}
-  :contentType="{{item.psEditor.editorParams.contentType}}"
+  contentType="{{item.psEditor.editorParams.contentType}}"
+{{else}}
+  contentType="RAW"
 {{/if}}
 {{#if item.psEditor.editorParams.icon}}
   iconClass="{{item.psEditor.editorParams.icon}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/slider.hbs

@@ -10,11 +10,11 @@
 {{#if item.psEditor.stepValue}}
   :step="{{item.psEditor.stepValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.min}}
-  :min="{{item.psEditor.editorParams.min}}"
+{{#if item.psEditor.minValue}}
+  :min="{{item.psEditor.minValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.max}}
-  :max="{{item.psEditor.editorParams.max}}"
+{{#if item.psEditor.maxValue}}
+  :max="{{item.psEditor.maxValue}}"
 {{/if}}
 {{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
   :value="state.data.{{item.psEditor.name}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/editors/stepper.hbs

@@ -6,17 +6,17 @@
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-{{#if item.psEditor.editorParams.precision}}
-  :precision="{{item.psEditor.editorParams.precision}}"
+{{#if item.psEditor.precision}}
+  :precision="{{item.psEditor.precision}}"
 {{/if}}
 {{#if item.psEditor.stepValue}}
   :step="{{item.psEditor.stepValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.min}}
-  :min="{{item.psEditor.editorParams.min}}"
+{{#if item.psEditor.minValue}}
+  :min="{{item.psEditor.minValue}}"
 {{/if}}
-{{#if item.psEditor.editorParams.max}}
-  :max="{{item.psEditor.editorParams.max}}"
+{{#if item.psEditor.maxValue}}
+  :max="{{item.psEditor.maxValue}}"
 {{/if}}
 {{#if (or (eq ctrlType 'form') (eq ctrlType 'panel'))}}
   :value="state.data.{{item.psEditor.name}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-rawitem.hbs

@@ -3,8 +3,12 @@
   <AppRaw 
     name="{{item.codeName}}"
     v-show="state.detailsModel.{{item.codeName}}.visible"
-    {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
-    {{#if item.psSysImage}}{{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}{{/if}}
+    {{#if item.psSysCss}}
+    class="{{item.psSysCss.cssName}}"
+    {{/if}}
+    {{#if item.psSysImage}}
+    {{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}
+    {{/if}}
     contentType="{{item.contentType}}"
     style="{{#if item.rawItemHeight}}height: {{item.rawItemHeight}}px;{{/if}}{{#if item.rawItemWidth}}width: {{item.rawItemWidth}}px{{/if}}"
     {{#if (eq item.contentType 'RAW')}}value="{{item.rawContent}}"{{else if (eq item.contentType 'HTML')}}:value="`{{item.htmlContent}}`"{{/if}}/>
@@ -15,8 +19,12 @@
   <AppRaw 
     name="{{item.codeName}}"
     v-show="state.detailsModel.{{item.codeName}}.visible"
-    {{#if item.psSysCss}}class="{{item.psSysCss.cssName}}"{{/if}}
-    {{#if item.psSysImage}}{{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}{{/if}}
+    {{#if item.psSysCss}}
+    class="{{item.psSysCss.cssName}}"
+    {{/if}}
+    {{#if item.psSysImage}}
+    {{#if item.psSysImage.cssClass}}iconClass="{{item.psSysImage.cssClass}}"{{/if}}{{#if item.psSysImage.imagePath}}imgPath="{{item.psSysImage.imagePath}}"{{/if}}
+    {{/if}}
     contentType="{{item.contentType}}"
     style="{{#if item.rawItemHeight}}height: {{item.rawItemHeight}}px;{{/if}}{{#if item.rawItemWidth}}width: {{item.rawItemWidth}}px{{/if}}"
     {{#if (eq item.contentType 'RAW')}}value="{{item.rawContent}}"{{else if (eq item.contentType 'HTML')}}:value="`{{item.htmlContent}}`"{{/if}}/>

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/editors/app-auto-complete.vue

@@ -83,7 +83,7 @@ interface AutoCompleteProps {
   disabled?: boolean;
 
   /**
-   * @description 禁用
+   * @description 只读
    */
   readonly?: boolean;
 }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/components/editors/app-input.vue

@@ -93,7 +93,7 @@ const onChange = ($event: any) => {
       :disabled="disabled"
       :maxlength="maxLength"
       @blur="onChange"
-      :placeholder="placeholder"/>
+      :placeholder="showMaxLength ? `最大内容长度为${maxLength}` : placeholder"/>
     <a-input 
       allowClear
       v-else="Object.is('text', type)"