update：更新

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

+<IbizAutoComplete
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+  :data="state.data"
+{{#if item.valueItemName}}
+  valueItem="{{item.valueItemName}}"
+{{/if}}
+{{#if item.psEditor.getPlaceHolder}}
+  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{/if}}
+  :contextProp="state.context"
+  :viewParamsProp="state.viewParams"
+{{#if item.psEditor.psNavigateContexts}}
+  localContext="{{item.psEditor.psNavigateContexts}}"
+{{/if}}
+{{#if item.psEditor.psNavigateParams}}
+  localParam="{{item.psEditor.psNavigateParams}}"
+{{/if}}
+{{#if item.psEditor.psAppDataEntity}}
+  deMajorField="{{item.psEditor.psAppDataEntity.majorPSAppDEField.codename}}"
+  deKeyField="{{item.psEditor.psAppDataEntity.codeName}}"
+{{/if}}
+  {{!-- :acParams="getAcParams({{item.psEditor}})" --}}
+{{#if item.psEditor.editorParams.sort}}
+  sort="{{item.psEditor.editorParams.sort}}"
+{{/if}}
+{{#if item.psEditor.editorParams.open}}
+  :open="{{item.psEditor.editorParams.open}}"
+{{/if}}
+{{#if item.psEditor.disabled}}
+  disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.editorParams.multiple}}
+  :multiple="{{item.psEditor.editorParams.multiple}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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

+<IbizCheckboxList
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+  :data="state.data"
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.isReadOnly}}
+  :readonly="{{item.psEditor.isReadOnly}}"
+{{/if}}
+{{#if item.psEditor.codeList}}
+  codeListTag="{{item.psEditor.codeList.codeListTag}}"
+  codeListType="{{item.psEditor.codeList.codeListType}}"
+  valueSeparator="{{item.psEditor.codeList.valueSeparator}}"
+{{/if}}
+{{#if item.psEditor.psNavigateContexts}}
+  localContext="{{item.psEditor.psNavigateContexts}}"
+{{/if}}
+{{#if item.psEditor.psNavigateParams}}
+  localParam="{{item.psEditor.psNavigateParams}}"
+{{/if}}
+  :contextProp="state.context"
+  :viewParamsProp="state.viewParams"
+  @editorEvent="handleEditorEvent"/>  

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

+<IbizCheckbox
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.isReadOnly}}
+  :readonly="{{item.psEditor.isReadOnly}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>  

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

+<IbizDataPicker
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+  :data="state.data"
+{{#if item.valueItemName}}
+  valueItem="{{item.valueItemName}}"
+{{/if}}
+{{#if item.psEditor.getPlaceHolder}}
+  placeholder="{{item.psEditor.getPlaceHolder}}"
+{{/if}}
+{{#if item.psEditor.disabled}}
+  disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.psNavigateContexts}}
+  localContext="{{item.psEditor.psNavigateContexts}}"
+{{/if}}
+{{#if item.psEditor.psNavigateParams}}
+  localParam="{{item.psEditor.psNavigateParams}}"
+{{/if}}
+  :contextProp="state.context"
+  :viewParamsProp="state.viewParams"
+{{#if item.psEditor.psAppDataEntity}}
+  deMajorField="{{item.psEditor.psAppDataEntity.majorPSAppDEField.codename}}"
+  deKeyField="{{item.psEditor.psAppDataEntity.codeName}}"
+{{/if}}
+{{!-- :pickupView="getPickupView({{item.psEditor}})" --}}
+{{!-- :linkView="getLinkView({{item.psEditor}})" --}}
+{{!-- :acParams="getAcParams({{item.psEditor}})" --}}
+{{#if item.psEditor.psAppDEACMode.minorSortDir}}
+  sort="{{item.psEditor.psAppDEACMode.minorSortDir}}"
+{{/if}}
+{{#if item.psEditor.pickUpData}}
+  pickUpData="{{item.psEditor.pickUpData}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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}}
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+{{#eq item.psEditor.editorType "DATEPICKEREX"}}
+  valueFormat="yyyy-MM-dd HH:mm:ss"
+  picker="date"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_NOTIME"}}
+  valueFormat="yyyy-MM-dd"
+  picker="date"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKER"}}
+  valueFormat="yyyy-MM-dd HH:mm:ss"
+  picker="date"
+  mode="time"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_HOUR"}}
+  valueFormat="yyyy-MM-dd HH"
+  picker="date"
+  mode="time"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_MINUTE"}}
+  valueFormat="yyyy-MM-dd HH:mm"
+  picker="time"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_SECOND"}}
+  valueFormat="yyyy-MM-dd HH:mm:ss"
+  picker="time"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_NODAY"}}
+  valueFormat="HH:mm:ss"
+  picker="date"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_NODAY_NOSECOND"}}
+  valueFormat="HH:mm"
+  picker="date"
+  mode="date"
+{{/eq}}
+{{#eq item.psEditor.editorType "DATEPICKEREX_NOSECOND"}}
+  valueFormat="yyyy-MM-dd HH:mm"
+  picker="date"
+  mode="date"
+{{/eq}}
+
+  @editorEvent="handleEditorEvent"/>

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

@@ -13,14 +13,14 @@
 {{#if item.psEditor.disabled}}
   disabled="{{item.psEditor.disabled}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.multiple}}
-  :multiple="{{item.psEditor.getEditorParams.multiple}}"
+{{#if item.psEditor.editorParams.multiple}}
+  :multiple="{{item.psEditor.editorParams.multiple}}"
 {{/if}}
-{{#if item.psEditor.getPSNavigateContexts}}
-  localContext="{{item.psEditor.getPSNavigateContexts}}"
+{{#if item.psEditor.psNavigateContexts}}
+  localContext="{{item.psEditor.psNavigateContexts}}"
 {{/if}}
-{{#if item.psEditor.getPSNavigateParams}}
-  localParam="{{item.psEditor.getPSNavigateParams}}"
+{{#if item.psEditor.psNavigateParams}}
+  localParam="{{item.psEditor.psNavigateParams}}"
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"

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

+<IbizInputIp
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>
+    

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

@@ -5,21 +5,21 @@
   placeholder="{{item.psEditor.getPlaceHolder}}"
 {{/if}}
 {{#if item.psEditor.disabled}}
-  disabled="{{item.psEditor.disabled}}"
+  :disabled="{{item.psEditor.disabled}}"
 {{/if}}
-{{#if item.psEditor.isReadOnly}}
-  :readonly="{{item.psEditor.isReadOnly}}"
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.max}}
-  :max="{{item.psEditor.getEditorParams.max}}"
+{{#if item.psEditor.editorParams.max}}
+  :max="{{item.psEditor.editorParams.max}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.min}}
-  :max="{{item.psEditor.getEditorParams.min}}"
+{{#if item.psEditor.editorParams.min}}
+  :max="{{item.psEditor.editorParams.min}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.precision}}
-  :precision="{{item.psEditor.getEditorParams.precision}}"
+{{#if item.psEditor.editorParams.precision}}
+  :precision="{{item.psEditor.editorParams.precision}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.maxLength}}
+{{#if item.psEditor.editorParams.maxLength}}
   :maxLength="{{item.psEditor.maxLength}}"
 {{/if}}
 {{#eq item.psEditor.editorType "TEXTBOX"}}

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}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+{{#if item.psEditor.editorParams.max}}
+  :max="{{item.psEditor.editorParams.max}}"
+{{/if}}
+{{#if item.psEditor.editorParams.allowHalf}}
+  :allowHalf="{{item.psEditor.editorParams.allowHalf}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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

+<IbizRaw
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+  :date="state.data"
+{{#if item.psEditor.editorParams.contentType}}
+  :contentType="{{item.psEditor.editorParams.contentType}}"
+{{/if}}
+{{#if item.psEditor.editorParams.icon}}
+  icon="{{item.psEditor.editorParams.icon}}"
+{{/if}}
+{{#if item.psEditor.editorParams.caption}}
+  caption="{{item.psEditor.editorParams.caption}}"
+{{/if}}
+  :contextProp="state.context"
+  :viewParamsProp="state.viewParams"
+  @editorEvent="handleEditorEvent"/>

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

+<IbizSlider
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+  :date="state.data"
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+{{#if item.psEditor.editorParams.step}}
+  :step="{{item.psEditor.editorParams.step}}"
+{{/if}}
+{{#if item.psEditor.editorParams.min}}
+  :min="{{item.psEditor.editorParams.min}}"
+{{/if}}
+{{#if item.psEditor.editorParams.max}}
+  :max="{{item.psEditor.editorParams.max}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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

@@ -8,20 +8,20 @@
 {{#if item.getDataType}}
   dataType="{{item.getDataType}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.unitName}}
-  unitName="{{item.psEditor.getEditorParams.unitName}}"
+{{#if item.psEditor.editorParams.unitName}}
+  unitName="{{item.psEditor.editorParams.unitName}}"
 {{/if}}
-{{#if item.psEditor.getEditorParams.valueFormat}}
-  valueFormat="{{item.psEditor.getEditorParams.valueFormat}}"
+{{#if item.psEditor.editorParams.valueFormat}}
+  valueFormat="{{item.psEditor.editorParams.valueFormat}}"
 {{/if}}
-{{#if item.psEditor.getPrecision}}
-  :precision="{{item.psEditor.getPrecision}}"
+{{#if item.psEditor.precision}}
+  :precision="{{item.psEditor.precision}}"
 {{/if}}
-{{#if item.psEditor.getPSNavigateContexts}}
-  localContext="{{item.psEditor.getPSNavigateContexts}}"
+{{#if item.psEditor.psNavigateContexts}}
+  localContext="{{item.psEditor.psNavigateContexts}}"
 {{/if}}
-{{#if item.psEditor.getPSNavigateParams}}
-  localParam="{{item.psEditor.getPSNavigateParams}}"
+{{#if item.psEditor.psNavigateParams}}
+  localParam="{{item.psEditor.psNavigateParams}}"
 {{/if}}
   :contextProp="state.context"
   :viewParamsProp="state.viewParams"/>

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}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+{{#if item.psEditor.editorParams.precision}}
+  :precision="{{item.psEditor.editorParams.precision}}"
+{{/if}}
+{{#if item.psEditor.editorParams.step}}
+  :step="{{item.psEditor.editorParams.step}}"
+{{/if}}
+{{#if item.psEditor.editorParams.min}}
+  :min="{{item.psEditor.editorParams.min}}"
+{{/if}}
+{{#if item.psEditor.editorParams.max}}
+  :max="{{item.psEditor.editorParams.max}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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

+<IbizSwitch
+  name="{{item.codeName}}"
+  :value="state.data.{{item.psEditor.name}}"
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.isReadOnly}}
+  :readonly="{{item.psEditor.isReadOnly}}"
+{{/if}}
+{{#if item.psEditor.editorParams.size}}
+  size="{{item.psEditor.editorParams.size}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>  

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}}
+{{#if item.psEditor.editorParams.multiple}}
+  multiple="{{item.psEditor.editorParams.multiple}}"
+{{/if}}
+{{#if item.psEditor.editorParams.showUploadList}}
+  showUploadList="{{item.psEditor.editorParams.showUploadList}}"
+{{/if}}
+{{#if item.psEditor.editorParams.Tooltip}}
+  Tooltip="{{item.psEditor.editorParams.Tooltip}}"
+{{/if}}
+{{#if item.psEditor.disabled}}
+  :disabled="{{item.psEditor.disabled}}"
+{{/if}}
+{{#if item.psEditor.readOnly}}
+  :readonly="{{item.psEditor.readOnly}}"
+{{/if}}
+  @editorEvent="handleEditorEvent"/>

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

@@ -56,16 +56,6 @@ interface AutoCompleteProps {
    */
   deKeyField?: string;
 
-  /**
-   * @description 选择视图
-   */
-  pickUpView?: IParam;
-
-  /**
-   * @description 链接视图
-   */
-  linkView?: IParam;
-
   /**
    * @description ac参数
    */

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

@@ -33,15 +33,7 @@ interface RawProps {
    * @type {string}
    * @memberof AppRawItem
    */
-  imageClass?: string;
-
-  /**
-   * 图片
-   *
-   * @type {string}
-   * @memberof AppRawItem
-   */
-  imgUrl?: string;
+  icon?: string;
 
   /**
    * 标题
@@ -96,8 +88,8 @@ onBeforeMount(() => {
     </div>
     <div v-else-if="Object.is(contentType, 'HTML')" v-html="content" />
     <div v-else-if="Object.is(contentType, 'IMAGE')">
-      <img v-if="imgUrl" :src="imgUrl" />
-      <a-icon v-else :type="imageClass || ''" />
+      <img v-if="value" :src="value" />
+      <a-icon v-else :type="icon || ''" />
     </div>
   </div>
 </template>

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

@@ -13,7 +13,7 @@ interface toolbarEmit {
 }
 const props = withDefaults(defineProps<ToolbarProps>(), {});
 const emit = defineEmits<toolbarEmit>();
-const items: Ref<IParam[]> = ref(props.toolbarModel.items || []);
+const items: Ref<IParam[]> = ref(props.toolbarModel?.items || []);
 const { context, viewParams } = useContextParams(props);
 const getItemClass = (item: IParam) => {
   //todo 样式表