super-page-designer 2.0.23 → 2.0.31

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

@@ -1,4 +1,5 @@
 import http from "agilebuilder-ui/src/utils/request";
+import { getFormPropName } from "./page-helper-util.js";
 function queryTableFields(systemCode, systemVersion, tableName) {
   let url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns";
   url += "?systemCode=" + (systemCode ? systemCode : "");
@@ -12,7 +13,10 @@ function queryTableFieldsOrMap(systemCode, systemVersion, tableName) {
     publishVersion: systemVersion,
     tableName
   };
-  return http.get(window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns/findAttributeMap", param);
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/table-columns/findAttributeMap",
+    param
+  );
 }
 function querySublist(systemCode, systemVersion, publishVersion) {
   const param = {
@@ -37,28 +41,29 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   delete tableConfigure.runtime;
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
+  const listCode = "V" + pageDesign.version + "__" + pageDesign.code + "__" + configureCopy.uuid;
   const listView = {
     configure: tableConfigureStr,
     // uuid
-    code: configureCopy.uuid,
+    code: listCode,
     // 名称
     name: configureCopy.label,
     // 合计方式，不合计（no)，当前页(current)，所有页(all),使用radio选择
-    totalType: configureCopy.props.base.totalType,
+    totalType: configureCopy.props.base ? configureCopy.props.base.totalType : null,
     // 备注
-    remark: configureCopy.props.base.remark,
+    remark: configureCopy.props.base ? configureCopy.props.base.remark : null,
     // 是否分页
-    pagination: configureCopy.props.base.paging,
+    pagination: configureCopy.props.base ? configureCopy.props.base.subPaging : null,
     // 默认行数
-    rowNum: configureCopy.props.base.pageSize,
+    rowNum: configureCopy.props.base ? configureCopy.props.base.pageSize : null,
     // 可选行数
-    optionalRows: configureCopy.props.base.pageSizes,
+    optionalRows: configureCopy.props.base ? configureCopy.props.base.pageSizes : null,
     // 布局
-    layout: JSON.stringify(configureCopy.props.base.layout),
+    layout: configureCopy.props.base ? JSON.stringify(configureCopy.props.base.layout) : null,
     // 查询方式,不查询（no），内置查询（buildin），自定义查询（custom）
-    startQuery: configureCopy.props.base.startQuery,
+    startQuery: configureCopy.props.base ? configureCopy.props.base.startQuery : null,
     // 是否是弹出式查询(true为弹出，false为嵌入)
-    popUp: configureCopy.props.base.popUp,
+    popUp: configureCopy.props.base ? configureCopy.props.base.popUp : null,
     // 是否高级查询 isAdvancedQuery: boolean
     // 是否启用模糊查询-暂不使用 isSearchFaint: boolean
     // 是否初始化查询
@@ -66,20 +71,20 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 默认查询条件
     defaultQueryCriteria: configureCopy.props.dataOrigin.defaultQueryCriteria,
     // 查询表单label位置
-    queryLabelPosition: configureCopy.props.base.queryLabelPosition,
+    queryLabelPosition: configureCopy.props.base ? configureCopy.props.base.queryLabelPosition : null,
     // 是否需要操作:增改
-    editable: configureCopy.props.base.editable,
+    editable: configureCopy.props.base ? configureCopy.props.base.editable : null,
     // 操作列宽设置 columnWidth: number
     // 行顺序字段名称 fieldForOrder: string
     // 保存行顺序的url urlToSaveOrder: string
     // 保存行信息的url urlToSaveRow: string
     // 删除行信息的url urlToDeleteRow: string
     // 显示列表内容的url，如果列表组件没有传url属性，则该url为准。
-    urlToListData: configureCopy.props.base.urlToListData,
+    urlToListData: configureCopy.props.base ? configureCopy.props.base.urlToListData : null,
     // 是否是sql查询列表内容。影响到列表内容显示。
     isSql: true,
     // 列表组件中是否显示“字段配置”按钮
-    customConfig: configureCopy.props.base.customConfig,
+    customConfig: configureCopy.props.base ? configureCopy.props.base.customConfig : null,
     // 数据表
     tableName: configureCopy.props.dataOrigin.tableName,
     // 系统编码 systemCode: string
@@ -89,17 +94,17 @@ function getListView(configureCopy, pageDesign, tableConfigureStr) {
     // 默认排序字段
     defaultSortField: JSON.stringify(configureCopy.props.dataOrigin.sortField),
     // 标题显示位置
-    titleAlign: configureCopy.props.base.alignTittle,
+    titleAlign: configureCopy.props.base ? configureCopy.props.base.alignTittle : null,
     // 内容显示位置
-    contAlign: configureCopy.props.base.alignContent,
+    contAlign: configureCopy.props.base ? configureCopy.props.base.alignContent : null,
     // 显示效果
-    displayEffect: configureCopy.props.base.displayEffect,
+    displayEffect: configureCopy.props.base ? configureCopy.props.base.displayEffect : null,
     // 封面图片附件的名称 imageName: string
     // 封面图片附件的uuid imageUuid: string
     // 是否支持拖拽列自定义列顺序
-    isDragColumn: configureCopy.props.base.isDragColumn,
+    isDragColumn: configureCopy.props.base ? configureCopy.props.base.isDragColumn : null,
     // 是否显示边框
-    border: configureCopy.props.base.border
+    border: configureCopy.props.base ? configureCopy.props.base.border : null
     // 国际化key i18nKey: string
     // 列设置 items: any
     // groupHeader groupHeaders: any
@@ -112,12 +117,12 @@ function getListColumns(configure, pageDesign) {
   var _a;
   const listColumns = [];
   (_a = configure.items) == null ? void 0 : _a.forEach((item) => {
-    ({ controlName: getControlName(item.name) });
+    const listColumn = { controlName: getControlName(item) };
     const temp = {
       // 列头名
       headerName: item.props.base.name,
       //对应数据表字段名字。(listColumn的tableColumn）占位符列和$selection、$index两列时为固定值(listColumn的prop）
-      prop: item.props.base.prop,
+      prop: getFormPropName(item.props.base.prop),
       //列宽
       width: item.props.base.columnWidth,
       //是否排序 true false custom
@@ -133,7 +138,7 @@ function getListColumns(configure, pageDesign) {
       //冻结列 left right false
       listColumnFixed: item.props.base.listColumnFixed,
       // 格式设置
-      format: item.props.format,
+      format: getPropsFormat(item),
       //值设置，以逗号隔开:数据库值:显示的值,数据库值:显示的值...
       valueSet: getListColumnValueSet(item),
       // 查询设置  no 不查询 normal 普通查询 advanced 高级查询
@@ -147,7 +152,7 @@ function getListColumns(configure, pageDesign) {
       // 编辑时默认值设置
       defaultValue: item.props.base.defaultValue,
       // 编辑时控件类型
-      controlName: item.name,
+      controlName: listColumn.controlName,
       // 控件属性配置
       controlConfig: getControlConfig(item),
       //事件类型,json格式，格式为：{input:funName1,blur:funName2,focus:funName3,...}，funName1、funName2等方法名，通过列表的options.eventCallBack传入
@@ -172,7 +177,7 @@ function getListColumns(configure, pageDesign) {
       // 校验的类型
       checkType: configure.props.verification.type,
       // 内容显示位置
-      contAlign: configure.props.base.alignContent
+      contAlign: configure.props.base ? configure.props.base.alignContent : null
       // 国际化key，如果配置了该列则使用该列的key去查询国际化配置，如果没用配置就以“headerName”字段的值为准
       // i18nKey: string
       /**
@@ -190,23 +195,33 @@ function getGroupHeaders(configure) {
   const result = [];
   if (configure.props.groupHeaders) {
     configure.props.groupHeaders.forEach((item) => {
-      result.push({
+      const header = {
         titleText: item.titleText,
-        prop: item.props.base.prop,
         parentCode: item.parentUuid,
         displayOrder: item.displayOrder,
         uuid: item.uuid
-      });
+      };
+      if (item.props.base && item.props.base.prop) {
+        header.prop = getNameFromProp(item.props.base.prop);
+      }
+      result.push(header);
     });
   }
   return result;
 }
 function getListColumnValueSet(item, listColumn) {
   const configureProps = item.props;
+  if (item.name === "inputNumber") {
+    return null;
+  }
   if (configureProps.dataOrigin && configureProps.dataOrigin.optionValueSetType) {
     const optionType = configureProps.dataOrigin.optionValueSetType;
     if (optionType === "static") {
-      return optionType + ":" + configureProps.dataOrigin.staticStates;
+      const valueSets = [];
+      configureProps.dataOrigin.staticStates.forEach((element) => {
+        valueSets.push(element.value + ":" + element.label);
+      });
+      return valueSets.join(",");
     } else if (optionType === "optionGroup") {
       return optionType + ":" + configureProps.dataOrigin.optionGroup;
     } else if (optionType === "dynamicData") {
@@ -232,7 +247,7 @@ function getValueSetOptions(item) {
       configureProps.dataOrigin.autoSets.forEach((element) => {
         const target = getNameFromProp(element.target);
         valueSetOptions.push({
-          columnName: element.source,
+          columnName: getNameFromProp(element.source),
           valueField: target,
           valueColumn: { name: target, dbColumnName: target.toUpperCase() }
         });
@@ -261,10 +276,16 @@ function getControlName(item) {
       return "switch";
     case "select":
       return getSelectControlName(item);
+    case "radio":
+      return "select";
+    case "checkbox":
+      return "multiselect";
     case "datePicker":
       return getDatePickerControlName(item);
     case "dept-tree":
       return getOrgTreeControlName(item);
+    case "inputNumber":
+      return "inputNumber";
     default:
       return "input";
   }
@@ -276,7 +297,7 @@ function getSelectControlName(item) {
   return "select";
 }
 function getDatePickerControlName(item) {
-  switch (item.props.base.dateType) {
+  switch (item.props.base.type) {
     case "date":
       return "date";
     case "time":
@@ -321,7 +342,7 @@ function getOrgTreeSet(item) {
     const orgTreeSetArr = [];
     if (item.props.base.otherFieldSets && item.props.base.otherFieldSets.length > 0) {
       item.props.base.otherFieldSets.forEach((filedSet) => {
-        orgTreeSetArr.push({ type: filedSet.source, model: filedSet.target });
+        orgTreeSetArr.push({ type: filedSet.source, model: getNameFromProp(filedSet.target) });
       });
     }
     return JSON.stringify({ orgTreeSetArr });
@@ -358,10 +379,20 @@ function getControlConfig(item) {
   }
   return null;
 }
+function getPropsFormat(item) {
+  if (item.props.format && item.props.format.type === "hyperlinks") {
+    const format = JSON.parse(JSON.stringify(item.props.format));
+    Object.assign(format, item.props.linkPage);
+    return JSON.stringify(format);
+  }
+  return JSON.stringify(item.props.format);
+}
 function getNameFromProp(prop) {
-  const match = prop.match(/\${(.*?)\.(.*?)}/);
-  if (match) {
-    return match[2];
+  if (prop) {
+    const match = prop.match(/\${(.*?)\.(.*?)}/);
+    if (match) {
+      return match[2];
+    }
   }
   return prop;
 }

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

@@ -7,8 +7,16 @@ const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "button-attr-advanced",
   props: {
-    configure: Object,
-    default: () => ({ props: {} })
+    configure: {
+      type: Object,
+      default: () => {
+      }
+    },
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
+    }
   },
   setup(__props) {
     const props = __props;
@@ -69,6 +77,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function closeSetDialog() {
       setVisible.value = false;
     }
+    function saveSetting(setData) {
+      props.configure.props.setValueList = setData;
+      console.log("%c描述-153236", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.setValueList);
+    }
     const combinationVisible = ref(false);
     function closeCombinationDialog() {
       combinationVisible.value = false;
@@ -235,14 +247,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }),
               conditionVisible.value ? (openBlock(), createBlock(_sfc_main$1, {
                 key: 0,
+                pageDesign: __props.pageDesign,
                 configure: __props.configure,
                 onClose: closeConditionDialog
-              }, null, 8, ["configure"])) : createCommentVNode("", true),
+              }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
               setVisible.value ? (openBlock(), createBlock(_sfc_main$2, {
                 key: 1,
+                pageDesign: __props.pageDesign,
                 configure: __props.configure,
+                onSave: saveSetting,
                 onClose: closeSetDialog
-              }, null, 8, ["configure"])) : createCommentVNode("", true),
+              }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$3, {
                 key: 2,
                 conditionList: __props.configure.props.base.showCondition,

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

@@ -634,7 +634,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.props.base.tableUuid,
-                          "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => __props.configure.props.base.tableUuid = $event)
+                          "onUpdate:modelValue": _cache[21] || (_cache[21] = ($event) => __props.configure.props.base.tableUuid = $event),
+                          clearable: "",
+                          filterable: ""
                         }, {
                           default: withCtx(() => [
                             (openBlock(true), createElementBlock(Fragment, null, renderList(tableList.value, (item) => {

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

@@ -61,7 +61,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["configure", "pageDesign"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
-          withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$2, {
+            configure: __props.configure,
+            pageDesign: __props.pageDesign
+          }, null, 8, ["configure", "pageDesign"]), [
             [vShow, unref(currentConfigType) === "advanced"]
           ]),
           withDirectives(createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]), [

package/dist/es/components/design/views/assemblys/button/component/combination.vue.js

@@ -11,6 +11,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: String,
       default: "[]"
     },
+    list: {
+      type: Array,
+      default: () => []
+    },
     // 字段名列表
     fieldNameList: {
       type: Array,
@@ -35,6 +39,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.conditionList) {
         tableData.value = JSON.parse(props.conditionList);
       }
+      if (props.list) {
+        tableData.value = props.list;
+      }
     });
     function remove() {
       tableData.value = tableData.value.filter((item) => item != currentRow.value);
@@ -180,11 +187,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     onChange: ($event) => changeFieldName(scope.$index, scope.row.propName)
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(__props.fieldNameList, (Ttime, index) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(__props.fieldNameList, (item) => {
                         return openBlock(), createBlock(_component_el_option, {
-                          key: index,
-                          label: Ttime.label,
-                          value: Ttime.value
+                          key: item.id,
+                          label: item.alias,
+                          value: item.dbColumnName
                         }, null, 8, ["label", "value"]);
                       }), 128))
                     ]),

package/dist/es/components/design/views/assemblys/button/component/condition-dialog.vue.js

@@ -19,7 +19,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const currentRow = ref({});
     const combinationVisible = ref(false);
     const tableSelectIndex = ref("");
-    const attributeMap = ref([
+    ref([
       {
         dbColumnName: "FIRST_TASK_ID",
         label: "该流程的第一个任务的id",
@@ -39,7 +39,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         value: "AUDIT_REPORT_NO"
       }
     ]);
-    const fieldMap = ref({
+    ref({
       "FIRST_TASK_ID": {
         dbColumnName: "FIRST_TASK_ID",
         label: "该流程的第一个任务的id",
@@ -158,8 +158,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(_component_el_input, {
                     "model-value": unref(formatConditionList)(
                       scope.row.sqlFilterCondition,
-                      attributeMap.value,
-                      fieldMap.value
+                      _ctx.pageDesign.modelFields,
+                      _ctx.pageDesign.modelFieldsMap
                     ),
                     size: "default",
                     onClick: ($event) => opencombinationDialog(scope.row, scope.$index)
@@ -201,8 +201,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           combinationVisible.value ? (openBlock(), createBlock(_sfc_main$1, {
             key: 0,
             conditionList: conditionList.value,
-            fieldNameList: attributeMap.value,
-            fieldMap: fieldMap.value,
+            fieldNameList: _ctx.pageDesign.modelFields,
+            fieldMap: _ctx.pageDesign.modelFieldsMap,
             onSave: saveCondition,
             onClose: closeCombination
           }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true)

package/dist/es/components/design/views/assemblys/button/component/set-dialog.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createElementBlock, Fragment, renderList, createCommentVNode } from "vue";
 import { formatConditionList } from "../../../../utils/data-table-util.js";
 import { CirclePlus, Delete } from "@element-plus/icons-vue";
 import _sfc_main$1 from "./combination.vue.js";
@@ -11,9 +11,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
     }
   },
-  emits: ["close"],
+  emits: ["close", "save"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     const $emit = __emit;
@@ -21,68 +26,40 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const combinationVisible = ref(false);
     const tableSelectIndex = ref("");
     const conditionList = ref(null);
-    const attributeMap = ref([
-      {
-        dbColumnName: "FIRST_TASK_ID",
-        label: "该流程的第一个任务的id",
-        type: "TEXT",
-        value: "FIRST_TASK_ID"
-      },
-      {
-        dbColumnName: "ID",
-        label: "id",
-        type: "LONG",
-        value: "ID"
-      },
-      {
-        dbColumnName: "AUDIT_REPORT_NO",
-        label: "审核报告编号",
-        type: "TEXT",
-        value: "AUDIT_REPORT_NO"
-      }
-    ]);
-    const fieldMap = ref({
-      "FIRST_TASK_ID": {
-        dbColumnName: "FIRST_TASK_ID",
-        label: "该流程的第一个任务的id",
-        type: "TEXT",
-        value: "FIRST_TASK_ID"
-      },
-      "ID": {
-        dbColumnName: "ID",
-        label: "id",
-        type: "LONG",
-        value: "ID"
-      },
-      "AUDIT_REPORT_NO": {
-        dbColumnName: "AUDIT_REPORT_NO",
-        label: "审核报告编号",
-        type: "TEXT",
-        value: "AUDIT_REPORT_NO"
-      }
-    });
+    const tableRef = ref(null);
+    const tableData = ref([]);
+    if (props.configure.props.setValueList) {
+      tableData.value = props.configure.props.setValueList;
+    }
     function closeCombination() {
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.setValueList[tableSelectIndex.value]["combination"] = JSON.stringify(table);
+      tableData.value[tableSelectIndex.value]["conditionList"] = table;
+    }
+    function saveData() {
+      $emit("save", tableData.value);
+      $emit("close");
     }
     function opencombinationDialog(row, index) {
-      conditionList.value = row.combination;
+      conditionList.value = row.conditionList;
       tableSelectIndex.value = index;
       combinationVisible.value = true;
     }
     function afterBindDefaultValue(modelValue, row) {
       row.defaultValue = modelValue;
     }
+    function selectRow(row) {
+      tableRef.value.setCurrentRow(row);
+    }
     function remove() {
-      props.configure.props.base.setValueList = props.configure.props.base.setValueList.filter((item) => item !== currentRow.value);
+      tableData.value = tableData.value.filter((item) => item !== currentRow.value);
     }
     function handleCurrentChange(val) {
       currentRow.value = val;
     }
     function add() {
-      props.configure.props.base.setValueList.push({});
+      tableData.value.push({});
     }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
@@ -97,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "model-value": "",
         title: "自动设值",
         "append-to-body": "",
-        onClose: _cache[2] || (_cache[2] = ($event) => $emit("close"))
+        onClose: _cache[1] || (_cache[1] = ($event) => $emit("close"))
       }, {
         footer: withCtx(() => [
           createElementVNode("div", _hoisted_1, [
@@ -111,7 +88,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }),
             createVNode(_component_el_button, {
               type: "primary",
-              onClick: _cache[1] || (_cache[1] = ($event) => $emit("close"))
+              onClick: saveData
             }, {
               default: withCtx(() => [
                 createTextVNode(" 确定 ")
@@ -149,10 +126,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 1
           }),
           createVNode(_component_el_table, {
+            ref_key: "tableRef",
+            ref: tableRef,
             "highlight-current-row": "",
-            onCurrentChange: handleCurrentChange,
-            data: props.configure.props.base.setValueList,
-            style: { "width": "100%" }
+            data: tableData.value,
+            style: { "width": "100%" },
+            onCurrentChange: handleCurrentChange
           }, {
             default: withCtx(() => [
               createVNode(_component_el_table_column, {
@@ -165,7 +144,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     modelValue: scope.row.fillType,
                     "onUpdate:modelValue": ($event) => scope.row.fillType = $event,
                     clearable: "",
-                    size: "default"
+                    size: "default",
+                    onFocus: ($event) => selectRow(scope.row)
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_el_option, {
@@ -182,7 +162,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       })
                     ]),
                     _: 2
-                  }, 1032, ["modelValue", "onUpdate:modelValue"])
+                  }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus"])
                 ]),
                 _: 1
               }),
@@ -194,13 +174,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 default: withCtx((scope) => [
                   createVNode(_component_el_input, {
                     "model-value": unref(formatConditionList)(
-                      scope.row.combination,
-                      attributeMap.value,
-                      fieldMap.value
+                      scope.row.conditionList,
+                      __props.pageDesign.modelFields,
+                      __props.pageDesign.modelFieldsMap
                     ),
                     size: "default",
+                    onFocus: ($event) => selectRow(scope.row),
                     onClick: ($event) => opencombinationDialog(scope.row, scope.$index)
-                  }, null, 8, ["model-value", "onClick"])
+                  }, null, 8, ["model-value", "onFocus", "onClick"])
                 ]),
                 _: 1
               }),
@@ -219,16 +200,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         modelValue: scope.row.field,
                         "onUpdate:modelValue": ($event) => scope.row.field = $event,
                         clearable: "",
-                        size: "default"
+                        size: "default",
+                        onFocus: ($event) => selectRow(scope.row)
                       }, {
                         default: withCtx(() => [
-                          createVNode(_component_el_option, {
-                            label: "1",
-                            value: "1"
-                          })
+                          (openBlock(true), createElementBlock(Fragment, null, renderList(__props.pageDesign.modelFields, (item) => {
+                            return openBlock(), createBlock(_component_el_option, {
+                              key: item.id,
+                              label: item.alias,
+                              value: item.dbColumnName
+                            }, null, 8, ["label", "value"]);
+                          }), 128))
                         ]),
                         _: 2
-                      }, 1032, ["modelValue", "onUpdate:modelValue"])
+                      }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus"])
                     ]),
                     _: 1
                   }),
@@ -239,9 +224,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   }, {
                     default: withCtx((scope) => [
                       createVNode(BindVariable, {
+                        onFocus: ($event) => selectRow(scope.row),
                         modelValue: scope.row.defaultValue,
                         "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
-                      }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                      }, null, 8, ["onFocus", "modelValue", "onUpdate:modelValue"])
                     ]),
                     _: 1
                   })
@@ -254,8 +240,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           combinationVisible.value ? (openBlock(), createBlock(_sfc_main$1, {
             key: 0,
             conditionList: conditionList.value,
-            fieldNameList: attributeMap.value,
-            fieldMap: fieldMap.value,
+            fieldNameList: __props.pageDesign.modelFields,
+            fieldMap: __props.pageDesign.modelFieldsMap,
             onSave: saveCondition,
             onClose: closeCombination
           }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true)