super-page-designer 2.0.89 → 2.0.93

package/dist/es/components/design/utils/interfaces/page-design-types.d.ts

@@ -75,6 +75,7 @@ export interface PageDesign extends Component {
         [uuid: string]: object;
     };
     i18nLabels?: Array<object>;
+    listCodesMap?: object;
 }
 /**
  * 页面资源

package/dist/es/components/design/utils/page-table-util.d.ts

@@ -35,5 +35,6 @@ export declare function setTableRuntimesFromConfigure(tableConfigure: Component,
  * @return {*}
  */
 export declare function tableResetConfigIndo(configure: object, moduleValue: any): void;
-export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): void;
+export declare function changeFeieldToMap(modelFieldsMap: any, tableFields: any): any;
 export declare function getTableNameByTableUuid(pageDesign: any, tableUuid: any): any;
+export declare function getModelOptionsByFields(dataFieldList: any): any;

package/dist/es/components/design/utils/page-table-util.js

@@ -489,20 +489,36 @@ function changeFeieldToMap(modelFieldsMap, tableFields) {
   tableFields.forEach((attrbt) => {
     modelFieldsMap[attrbt.dbColumnName] = attrbt;
   });
+  return modelFieldsMap;
 }
 function getTableNameByTableUuid(pageDesign, tableUuid) {
   let tableName = pageDesign.tableName;
-  if (!tableUuid && tableName) {
+  if (tableName) {
     return tableName;
   }
   let tableConfigure;
-  if (pageDesign.tableRuntimes && tableUuid && pageDesign.tableRuntimes[tableUuid]) {
+  if (pageDesign.tableRuntimes && tableUuid && pageDesign.tableRuntimes[tableUuid] && pageDesign.pageType && pageDesign.pageType === "list") {
     tableConfigure = JSON.parse(pageDesign.tableRuntimes[tableUuid].configure);
   }
   return tableConfigure && tableConfigure.props && tableConfigure.props.dataOrigin ? tableConfigure.props.dataOrigin.tableName : null;
 }
+function getModelOptionsByFields(dataFieldList) {
+  let dataModelOptions = [];
+  if (dataFieldList) {
+    dataFieldList.forEach((element) => {
+      dataModelOptions.push({
+        value: element.dbColumnName,
+        // element.name
+        label: element.alias,
+        alias: element.alias
+      });
+    });
+  }
+  return dataModelOptions;
+}
 export {
   changeFeieldToMap,
+  getModelOptionsByFields,
   getTableNameByTableUuid,
   querySublist,
   queryTableFields,

package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js

@@ -41,13 +41,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function queryTemplateList() {
-      let data = {
-        searchParam: {
-          code: "DC_TEMPLATE_MANAGEMENT"
-        }
-      };
+      var _a;
+      let data = {};
+      const systemVersion = (_a = props.pageDesign) == null ? void 0 : _a.systemVersion;
       http.post(
-        window["$vueApp"].config.globalProperties.baseAPI + `/dc/template-management/list/${props.pageDesign.systemCode}`,
+        window["$vueApp"].config.globalProperties.baseAPI + `/dc/template-management/list/${props.pageDesign.systemCode}?publishVersion=${systemVersion}`,
         data
       ).then((res) => {
         templateList.value = res.data;
@@ -621,6 +619,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_select, {
                           modelValue: templateFileUuids.value,
                           "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => templateFileUuids.value = $event),
+                          filterable: "",
                           multiple: "",
                           onChange: templateFilesChange
                         }, {

package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr-base.vue.js

@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.base.iconValue = iconValue;
     }
     function queryPdfTemplate() {
-      let data = { searchParam: { code: "DC_PDF_TEMPLATE" } };
+      let data = {};
       http.post(
         window["$vueApp"].config.globalProperties.baseAPI + `/dc/pdf-templates/list/${props.pageDesign.systemCode}`,
         data

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.d.ts

@@ -40,6 +40,44 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    dataModelOptions: {
+        type: {
+            (arrayLength: number): object[];
+            (...items: object[]): object[];
+            new (arrayLength: number): object[];
+            new (...items: object[]): object[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default: any;
+    };
+    objModelOptions: {
+        type: {
+            (arrayLength: number): object[];
+            (...items: object[]): object[];
+            new (arrayLength: number): object[];
+            new (...items: object[]): object[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default: any;
+    };
+    needData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (...args: any[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -84,6 +122,44 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    dataModelOptions: {
+        type: {
+            (arrayLength: number): object[];
+            (...items: object[]): object[];
+            new (arrayLength: number): object[];
+            new (...items: object[]): object[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default: any;
+    };
+    objModelOptions: {
+        type: {
+            (arrayLength: number): object[];
+            (...items: object[]): object[];
+            new (arrayLength: number): object[];
+            new (...items: object[]): object[];
+            isArray(arg: any): arg is any[];
+            readonly prototype: any[];
+            from<T>(arrayLike: ArrayLike<T>): T[];
+            from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+            from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+            from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+            of<T_4>(...items: T_4[]): T_4[];
+            readonly [Symbol.species]: ArrayConstructor;
+        };
+        default: any;
+    };
+    needData: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:modelValue"?: (...args: any[]) => any;
 }, {
@@ -94,5 +170,8 @@ declare const _default: import('vue').DefineComponent<{
     showLabel: boolean;
     needParams: boolean;
     isRange: boolean;
+    dataModelOptions: object[];
+    objModelOptions: object[];
+    needData: boolean;
 }, {}>;
 export default _default;

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,7 +1,7 @@
-import _sfc_main from "./common-variable-bind.vue2.js";
+import _sfc_main from "./common-variable-bind.vue3.js";
 /* empty css                          */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-34b580aa"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7fcec2fa"]]);
 export {
   BindVariable as default
 };

package/dist/es/components/design/views/assemblys/common/{common-variable-bind.vue2.js → common-variable-bind.vue3.js}

@@ -5,7 +5,7 @@ import { deepCopy, getUuidv4 } from "../../../utils/common-util.js";
 import { getTypeOptions, taskVarOptions, contextVarOptions } from "./common-variable-bind-option.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
 import { tableField } from "../../../../../stores/table-store.js";
-const _withScopeId = (n) => (pushScopeId("data-v-34b580aa"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-7fcec2fa"), n = n(), popScopeId(), n);
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -54,6 +54,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     isTable: {
       type: Boolean,
       default: false
+    },
+    dataModelOptions: {
+      type: Array,
+      default: null
+    },
+    objModelOptions: {
+      type: Array,
+      default: null
+    },
+    // 是否需要data
+    needData: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["update:modelValue"],
@@ -80,9 +93,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       window.addEventListener("click", handleClickOutside);
       const pageContext = pageContextUtil.pageContext;
       let hasTask = false;
-      let hasData = false;
-      if (props.isTable || pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
-        hasData = true;
+      let hasData = props.needData;
+      if (!hasData) {
+        if (props.isTable || pageContext && (!pageContext.pageType || pageContext.pageType == "form") && pageContext.tableName) {
+          hasData = true;
+        }
       }
       if (pageContext && pageContext.workflowCode && hasData) {
         hasTask = true;
@@ -244,11 +259,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return style;
     });
     function setSelectOptions() {
-      if (props.isTable) {
+      if (props.dataModelOptions && props.dataModelOptions.length > 0) {
+        selectOptions.value.dataModelOptions = props.dataModelOptions;
+      } else if (props.isTable) {
         selectOptions.value.dataModelOptions = tableFieldStore.fieldList;
       } else {
         selectOptions.value.dataModelOptions = pageContextUtil.pageContextVarOptions.dataOptions;
       }
+      if (props.objModelOptions && props.objModelOptions.length > 0) {
+        selectOptions.value.objModelOptions = props.objModelOptions;
+      }
       selectOptions.value.pageVarOptions = pageContextUtil.pageContextVarOptions.pageVarOptions;
     }
     function formatter() {
@@ -305,7 +325,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else if (value === "data") {
         valueOptions.value = selectOptions.value.dataModelOptions || [];
       } else if (value === "obj") {
-        valueOptions.value = selectOptions.value.dataModelOptions || [];
+        valueOptions.value = selectOptions.value.objModelOptions && selectOptions.value.objModelOptions.length > 0 ? selectOptions.value.objModelOptions : selectOptions.value.dataModelOptions || [];
         console.log("%c描述-172007", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", valueOptions.value);
       } else if (value === "params") {
         valueOptions.value = selectOptions.value.paramsVarOptions || [];
@@ -319,7 +339,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       popoverRef.value.hide();
     }
     function selectRow(row) {
-      debugger;
       if (row.type == "range") {
         if (row.symbolNum === "") {
           ElMessage.warning("周期不能为空!");

package/dist/es/components/design/views/assemblys/data/component/configuration-value.vue.js

@@ -31,10 +31,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formData.value.type = "";
       }
       if (!formData.value.valueSetOptions || formData.value.valueSetOptions.length == 0) {
-        formData.value.valueSetOptions = [{
-          columnName: "",
-          valueColumn: ""
-        }];
+        formData.value.valueSetOptions = [
+          {
+            columnName: "",
+            valueColumn: ""
+          }
+        ];
       }
     }
     const valueSettingBeannameTableSelect = ref({});
@@ -51,22 +53,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const queryOptionGroupLoading = ref(false);
     const optionGroups = ref([]);
     function queryOptionGroups(query) {
-      if (query) {
-        queryOptionGroupLoading.value = true;
-        const param = {
-          query
-        };
-        http.post(window.$vueApp.config.globalProperties.baseAPI + "/component/option-groups/query", param).then((result) => {
-          queryOptionGroupLoading.value = false;
-          optionGroups.value = result;
-        }).catch((error) => {
-          queryOptionGroupLoading.value = false;
-          console.log("查询选项组出错", error);
-        });
-      } else {
-        optionGroups.value = [];
+      queryOptionGroupLoading.value = true;
+      const param = {
+        query
+      };
+      http.post(window.$vueApp.config.globalProperties.baseAPI + "/component/option-groups/query", param).then((result) => {
         queryOptionGroupLoading.value = false;
-      }
+        optionGroups.value = result;
+      }).catch((error) => {
+        queryOptionGroupLoading.value = false;
+        console.log("查询选项组出错", error);
+      });
     }
     const queryDynamicSourceLoading = ref(false);
     const dynamicSources = ref([]);
@@ -127,6 +124,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function beforeClose() {
       emit("close");
     }
+    function dataTypeChange(value) {
+      if (value === "keyValuePair") ;
+      else if (value === "optionGroup") {
+        queryOptionGroups(true);
+      } else if (value === "enumname") ;
+      else if (value === "beanname") ;
+      else if (value === "dynamicDataSource") {
+        echoDataOrigin("");
+      }
+    }
     __expose({
       echoDataOrigin
     });
@@ -182,6 +189,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(_component_el_select, {
                     modelValue: formData.value.type,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value.type = $event),
+                    onChange: dataTypeChange,
                     placeholder: "请选择"
                   }, {
                     default: withCtx(() => [

package/dist/es/components/design/views/assemblys/data/component/dynamic-column.vue.js

@@ -97,14 +97,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else {
         props.configure.props.dynamicColumnData.columnModelTable[columnModelTableRowIndex.value].dynamicDataSourceData = configObj;
       }
-      console.log("%c描述-173933", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dynamicColumnData.columnModelTable);
+      console.log(
+        "%c描述-173933",
+        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+        props.configure.props.dynamicColumnData.columnModelTable
+      );
     }
     function configurationClose() {
       configurationVisible.value = false;
     }
     function formattingAdd(formattingData2) {
       props.configure.props.dynamicColumnData.columnModelTable[columnModelTableRowIndex.value].listColumnFormat = formattingData2;
-      console.log("%c描述-195126", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dynamicColumnData.columnModelTable);
+      console.log(
+        "%c描述-195126",
+        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+        props.configure.props.dynamicColumnData.columnModelTable
+      );
     }
     function formattingClose() {
       formattingVisible.value = false;
@@ -142,7 +150,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 512), [
-            [vShow, __props.configure.props.dynamicColumnData.columnModelTable && __props.configure.props.dynamicColumnData.columnModelTable.length > 0]
+            [
+              vShow,
+              __props.configure.props.dynamicColumnData.columnModelTable && __props.configure.props.dynamicColumnData.columnModelTable.length > 0
+            ]
           ])
         ]),
         createVNode(_component_el_dialog, {

package/dist/es/components/design/views/assemblys/data/component/table-children-column.vue.js

@@ -221,12 +221,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 8, ["modelValue"])) : __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.prop === "$selection" ? (openBlock(), createBlock(_component_el_checkbox, { key: 1 })) : __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.prop === "$index" ? (openBlock(), createElementBlock("span", _hoisted_2, "1")) : (openBlock(), createBlock(_sfc_main$1, {
               key: 3,
               configure: __props.listColumns,
+              pageDesign: __props.pageDesign,
               errorBlank: true,
               selectWidget: __props.selectWidget,
               indexObj: __props.indexObj,
               onOnSelectWidget: onSelectWidget,
               showSelectedClass: false
-            }, null, 8, ["configure", "selectWidget", "indexObj"]))
+            }, null, 8, ["configure", "pageDesign", "selectWidget", "indexObj"]))
           ]),
           key: "1"
         } : void 0

package/dist/es/components/design/views/assemblys/data/table/table-attr-advanced.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref, createCommentVNode } from "vue";
+import { defineComponent, ref, watch, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref, createCommentVNode } from "vue";
 import { Codemirror } from "vue-codemirror";
 import { Plus, Remove, Delete } from "@element-plus/icons-vue";
 import _sfc_main$1 from "../component/variate-select.vue.js";
@@ -57,6 +57,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const sublist = ref([]);
     const selectTableDialog = ref(null);
     const combinationVisible = ref(false);
+    const modelFields = ref([]);
+    const modelFieldsMap = ref({});
     watch(() => openCollapseItems.value, (newVal, oldVal) => {
       if (newVal.includes("deleteLogic") && !oldVal.includes("deleteLogic")) {
         querySublist(props.configure["tableSysCode"], props.configure["tableSysVersion"], props.pageDesign["version"]).then((res) => {
@@ -64,6 +66,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     });
+    onMounted(() => {
+      const systemCode = props.configure.props.otherSettings.tableSysCode ? props.configure.props.otherSettings.tableSysCode : props.pageDesign.systemCode;
+      const systemVersion = props.configure.props.otherSettings.tableSysVersion ? props.configure.props.otherSettings.tableSysVersion : props.pageDesign.version;
+      const tableName = props.configure.props.otherSettings.sourceDataTable;
+      queryTableFieldsRequest(systemCode, systemVersion, tableName);
+    });
     if (!props.configure.props.otherSettings.fillTableData) {
       props.configure.props.otherSettings.fillTableData = [{}];
     }
@@ -100,7 +108,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function clearTable() {
       props.configure.props.otherSettings.sourceDataTable = "";
       props.configure.props.otherSettings.alias = "";
-      props.configure.props.otherSettings.modelFields = [];
+      modelFields.value = [];
+      modelFieldsMap.value = {};
     }
     function onSelectTable(tableInfo) {
       let hisKey = props.configure.tableSysCode ? props.configure.tableSysCode : "";
@@ -120,15 +129,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.props.otherSettings.alias = tableInfo.alias;
         const systemCode = tableInfo.systemCode ? tableInfo.systemCode : props.pageDesign.systemCode;
         const systemVersion = tableInfo.systemVersion ? tableInfo.systemVersion : props.pageDesign.version;
-        queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
-          props.configure.props["otherSettings"]["modelFields"] = tableFields;
-          if (!props.configure.props["otherSettings"]["modelFieldsMap"]) {
-            props.configure.props["otherSettings"]["modelFieldsMap"] = {};
-          }
-          changeFeieldToMap(props.configure.props["otherSettings"]["modelFieldsMap"], tableFields);
-        });
+        const tableName = tableInfo.name;
+        queryTableFieldsRequest(systemCode, systemVersion, tableName);
       }
     }
+    function queryTableFieldsRequest(systemCode, systemVersion, tableName) {
+      queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
+        modelFields.value = tableFields;
+        modelFieldsMap.value = changeFeieldToMap(modelFieldsMap.value, tableFields);
+      });
+    }
     function addCascadingDeletionTable() {
       props.configure.props["deleteLogicSetting"].push({ secondTable: "" });
     }
@@ -579,8 +589,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_checkbox_group, {
-                          modelValue: __props.configure.props.otherSettings.isWithDataPermission,
-                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.otherSettings.isWithDataPermission = $event)
+                          modelValue: __props.configure.props.otherSettings.timeToInitializeSubTable,
+                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.otherSettings.timeToInitializeSubTable = $event)
                         }, {
                           default: withCtx(() => [
                             createVNode(_component_el_checkbox, {
@@ -774,7 +784,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       }),
                       createVNode(_component_el_form_item, {
                         label: "排序",
-                        title: "移动端行标题",
+                        title: "排序",
                         class: "amb-design-attr-item"
                       }, {
                         default: withCtx(() => [
@@ -786,7 +796,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               filterable: ""
                             }, {
                               default: withCtx(() => [
-                                (openBlock(true), createElementBlock(Fragment, null, renderList(__props.configure.props.otherSettings.modelFields, (item) => {
+                                (openBlock(true), createElementBlock(Fragment, null, renderList(modelFields.value, (item) => {
                                   return openBlock(), createBlock(_component_el_option, {
                                     key: item,
                                     label: item.alias,
@@ -913,7 +923,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                 filterable: ""
                               }, {
                                 default: withCtx(() => [
-                                  (openBlock(true), createElementBlock(Fragment, null, renderList(__props.configure.props.otherSettings.modelFields, (item) => {
+                                  (openBlock(true), createElementBlock(Fragment, null, renderList(modelFields.value, (item) => {
                                     return openBlock(), createBlock(_component_el_option, {
                                       key: item,
                                       label: item.alias,
@@ -1038,12 +1048,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["systemCode", "systemVersion"]),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 0,
-                conditionList: __props.configure.props.otherSettings.sourceQueryTableData,
-                fieldNameList: __props.configure.props.otherSettings.modelFields,
-                fieldMap: __props.configure.props.otherSettings.modelFieldsMap,
+                list: __props.configure.props.otherSettings.sourceQueryTableData ? JSON.parse(__props.configure.props.otherSettings.sourceQueryTableData) : null,
+                fieldNameList: modelFields.value,
+                fieldMap: modelFieldsMap.value,
+                dataFieldNameList: __props.pageDesign.modelFields,
+                paramTypes: ["data", "page", "task", "context", "system", "request", "fixed"],
                 onSave: saveCondition,
                 onClose: closeCombination
-              }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true)
+              }, null, 8, ["list", "fieldNameList", "fieldMap", "dataFieldNameList"])) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["modelValue"]),

package/dist/es/components/design/views/assemblys/data/table/table-design.vue.js

@@ -2,7 +2,7 @@ import _sfc_main from "./table-design.vue2.js";
 /* empty css                  */
 /* empty css                  */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-81648b04"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-55bb4cd3"]]);
 export {
   tableDesign as default
 };

package/dist/es/components/design/views/assemblys/data/table/table-design.vue2.js

@@ -143,7 +143,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const systemVersion = props.configure.tableSysVersion ? props.configure.tableSysVersion : props.pageDesign.version;
       const tableName = props.configure.props.dataOrigin.tableName;
       queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
-        changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
+        props.configure.modelFieldsMap = changeFeieldToMap(props.configure.modelFieldsMap, tableFields);
         props.configure.modelFields = tableFields;
       });
     }

package/dist/es/components/design/views/assemblys/data/table/tablecolumn-attr-base.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./tablecolumn-attr-base.vue2.js";
 /* empty css                           */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3560b979"]]);
+const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c93dc980"]]);
 export {
   TablecolumnAttrBase as default
 };