update: 更新

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

@@ -5,8 +5,8 @@
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
 {{/if}}
-{{#if item.psEditor.getPlaceHolder}}
-  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{#if item.psEditor.placeHolder}}
+  placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"

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

@@ -5,8 +5,8 @@
 {{#if item.valueItemName}}
   valueItem="{{item.valueItemName}}"
 {{/if}}
-{{#if item.psEditor.getPlaceHolder}}
-  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{#if item.psEditor.placeHolder}}
+  placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   disabled="{{item.psEditor.disabled}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/editor/date-picker.hbs

 <IbizDatePicker
   name="{{item.codeName}}"
   :value="state.data.{{item.psEditor.name}}"
-{{#if item.psEditor.getPlaceHolder}}
-  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{#if item.psEditor.placeHolder}}
+  placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/editor/dropdown-list.hbs

@@ -7,8 +7,8 @@
   codeListType="{{item.psEditor.codeList.codeListType}}"
   valueSeparator="{{item.psEditor.codeList.valueSeparator}}"
 {{/if}}
-{{#if item.psEditor.getPlaceHolder}}
-  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{#if item.psEditor.placeHolder}}
+  placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   disabled="{{item.psEditor.disabled}}"

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

 <IbizInput
   name="{{item.codeName}}"
   :value="state.data.{{item.psEditor.name}}"
-{{#if item.psEditor.getPlaceHolder}}
-  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{#if item.psEditor.placeHolder}}
+  placeholder="{{item.psEditor.placeHolder}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
@@ -19,9 +19,12 @@
 {{#if item.psEditor.editorParams.precision}}
   :precision="{{item.psEditor.editorParams.precision}}"
 {{/if}}
-{{#if item.psEditor.editorParams.maxLength}}
+{{#if item.psEditor.maxLength}}
   :maxLength="{{item.psEditor.maxLength}}"
 {{/if}}
+{{#if item.psEditor.showMaxLength}}
+  :showMaxLength="{{item.psEditor.showMaxLength}}"
+{{/if}}
 {{#eq item.psEditor.editorType "TEXTBOX"}}
   type="text"
 {{/eq}}

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

 <IbizRating
   name="{{item.codeName}}"
   :value="state.data.{{item.psEditor.name}}"
-  :date="state.data"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}

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

@@ -8,8 +8,8 @@
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-{{#if item.psEditor.editorParams.step}}
-  :step="{{item.psEditor.editorParams.step}}"
+{{#if item.psEditor.stepValue}}
+  :step="{{item.psEditor.stepValue}}"
 {{/if}}
 {{#if item.psEditor.editorParams.min}}
   :min="{{item.psEditor.editorParams.min}}"

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

 <IbizStepper
   name="{{item.codeName}}"
   :value="state.data.{{item.psEditor.name}}"
-  :date="state.data"
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
 {{/if}}
@@ -11,8 +10,8 @@
 {{#if item.psEditor.editorParams.precision}}
   :precision="{{item.psEditor.editorParams.precision}}"
 {{/if}}
-{{#if item.psEditor.editorParams.step}}
-  :step="{{item.psEditor.editorParams.step}}"
+{{#if item.psEditor.stepValue}}
+  :step="{{item.psEditor.stepValue}}"
 {{/if}}
 {{#if item.psEditor.editorParams.min}}
   :min="{{item.psEditor.editorParams.min}}"

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/editor/upload.hbs

 <IbizUpload
   name="{{item.codeName}}"
   :value="state.data.{{item.psEditor.name}}"
-{{#if item.psEditor.editorParams.accept}}
-  accept="{{item.psEditor.editorParams.accept}}"
-{{/if}}
 {{#if item.psEditor.editorParams.method}}
   method="{{item.psEditor.editorParams.method}}"
 {{/if}}
@@ -11,10 +8,10 @@
   multiple="{{item.psEditor.editorParams.multiple}}"
 {{/if}}
 {{#if item.psEditor.editorParams.showUploadList}}
-  showUploadList="{{item.psEditor.editorParams.showUploadList}}"
+  :showUploadList="{{item.psEditor.editorParams.showUploadList}}"
 {{/if}}
-{{#if item.psEditor.editorParams.Tooltip}}
-  Tooltip="{{item.psEditor.editorParams.Tooltip}}"
+{{#if item.psEditor.editorParams.tooltip}}
+  tooltip="{{item.psEditor.editorParams.tooltip}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
   :disabled="{{item.psEditor.disabled}}"
@@ -22,4 +19,13 @@
 {{#if item.psEditor.readOnly}}
   :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
+{{#if item.psEditor.maxFileCount}}
+  :limit="{{item.psEditor.maxFileCount}}"
+{{/if}}
+{{#eq item.psEditor.editorType "PICTURE"}}
+  accept='image/*'
+{{/eq}}
+{{#eq item.psEditor.editorType "PICTURE_ONE"}}
+  accept='image/*'
+{{/eq}}
   @editorEvent="handleEditorEvent"/>

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

@@ -73,10 +73,11 @@ const onChange = ($event: any) => {
   <div :class="['app-editor-container',`app-input-${name}`]">
     <a-input 
       allowClear
-      v-if="Object.is('text', type)"
+      v-if="Object.is('text', type) || Object.is('number', type)"
       v-model:value="value"
       :disabled="disabled"
       :maxlength="maxLength"
+      :type="type"
       @blur="onChange"
       :placeholder="showMaxLength ? `最大内容长度为${maxLength}` : placeholder" />
     <a-input-password 
@@ -87,22 +88,12 @@ const onChange = ($event: any) => {
       :placeholder="placeholder"/>
     <a-textarea 
       showCount
-      allowClear
       v-if="Object.is('textarea', type)"
       v-model:value="value"
       :disabled="disabled"
       :maxlength="maxLength"
       @blur="onChange"
       :placeholder="placeholder"/>
-    <a-input-number
-      v-if="Object.is('number', type)"
-      v-model:value="value"
-      :max="max"
-      :min="min"
-      :disabled="disabled"
-      :precision="precision"
-      @blur="onChange"
-      :placeholder="placeholder"/>
   </div>
 </template>
 

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

@@ -133,7 +133,7 @@ onBeforeMount(() => {
 
 <template>
   <div :class="['app-editor-container', `app-span-${name}`]">
-    <span></span>
+    <span>{{text}}</span>
   </div>
 </template>
 

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

@@ -45,12 +45,19 @@ interface UploadProps {
    */
   showUploadList: boolean;
 
+  /**
+   * 最大文件数
+   *
+   * @type {boolean}
+   */
+  limit: number;
+
   /**
    * 按钮提示信息
    *
    * @type {boolean}
    */
-  Tooltip: string;
+  tooltip: string;
 
   /**
    * 只读模式
@@ -77,7 +84,9 @@ const props = withDefaults(defineProps<UploadProps>(), {
   method: 'post',
   multiple: true,
   showUploadList: true,
-  Tooltip: '点击上传'
+  tooltip: '点击上传',
+  accept:"*",
+  limit: 999,
 });
 const emit = defineEmits<EditorEmit>();
 const uploadUrl = getUploadUrl();
@@ -101,6 +110,7 @@ const onChange = (value: number) => {
     <a-upload
       :action="uploadUrl"
       :method="method"
+      :accept="accept"
       v-model:fileList="fileList"
       :headers="headers"
       :multiple="multiple"
@@ -110,7 +120,7 @@ const onChange = (value: number) => {
       @change="onChange">
     <a-button>
       <upload-outlined></upload-outlined>
-      {{Tooltip}}
+      {{tooltip}}
     </a-button>
     </a-upload>
   </div>