super-page-designer 2.0.79 → 2.0.83

package/dist/es/components/design/utils/assemblys-config.js

@@ -1,5 +1,5 @@
 import { defineAsyncComponent } from "vue";
-import { getUuidv4, deepCopy } from "./common-util.js";
+import { deepCopy, getUuidv4 } from "./common-util.js";
 import groupContainer from "../../../assets/images/group-container.png.js";
 import containerForm from "../../../assets/images/container/container-form.png.js";
 import containerFLex from "../../../assets/images/container/container-flex.png.js";
@@ -46,7 +46,7 @@ import formCustom from "../../../assets/images/form/form-custom.png.js";
 import barcode from "../../../assets/images/data/barcode.png.js";
 import workflowHistoryImg from "../../../assets/images/workflow/workflow-history-img.png.js";
 const tableOperateColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -104,7 +104,7 @@ const tableOperateColumnConf = {
   }
 };
 const tableIndexColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -161,7 +161,7 @@ const tableIndexColumnConf = {
   }
 };
 const tableSelectionColumnConf = {
-  uuid: getUuidv4(),
+  uuid: "",
   name: "",
   props: {
     base: {
@@ -216,9 +216,14 @@ const tableSelectionColumnConf = {
     tittleClass: ""
   }
 };
+function getCopyColumn(columnConf) {
+  let copyColumn = deepCopy(columnConf);
+  copyColumn.uuid = getUuidv4();
+  return copyColumn;
+}
 function getTableColumnConf(fieldInfo) {
-  return {
-    uuid: getUuidv4(),
+  const columnConf = {
+    uuid: "",
     isTable: true,
     // 是否是表格组件
     name: "",
@@ -274,6 +279,7 @@ function getTableColumnConf(fieldInfo) {
       tittleClass: ""
     }
   };
+  return getCopyColumn(columnConf);
 }
 const assemblyGroups = [{
   name: "container",
@@ -283,7 +289,7 @@ const assemblyGroups = [{
     name: "form",
     label: "表单",
     icon: containerForm,
-    props: { size: { widthType: "flex", flexSpan: 24 } },
+    props: { base: {}, size: { widthType: "flex", flexSpan: 24 } },
     style: {},
     events: [
       { name: "beforeFormLoad", label: "加载表单数据前", tip: "还没有加载表单数据时" },
@@ -1236,9 +1242,9 @@ const assemblyGroups = [{
       }
     ],
     items: [
-      tableSelectionColumnConf,
-      tableIndexColumnConf,
-      tableOperateColumnConf
+      getTableSelectionConf(),
+      getTableIndexConf(),
+      getTableOperateConf()
     ],
     modelFields: [],
     props: {
@@ -2479,19 +2485,13 @@ function getPageConf() {
   return tempConf;
 }
 function getTableOperateConf() {
-  const conf = deepCopy(tableOperateColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableOperateColumnConf);
 }
 function getTableIndexConf() {
-  const conf = deepCopy(tableIndexColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableIndexColumnConf);
 }
 function getTableSelectionConf() {
-  const conf = deepCopy(tableSelectionColumnConf);
-  conf.uuid = getUuidv4();
-  return conf;
+  return getCopyColumn(tableSelectionColumnConf);
 }
 const standardButtonOperations = [
   {
@@ -2678,9 +2678,9 @@ function getInitialInformationByName(name) {
     for (let j = 0; j < items.length; j++) {
       let item = items[j];
       if (item.name == name) {
-        initUse.props = item.props;
-        initUse.style = item.style;
-        initUse.events = item.events;
+        initUse.props = deepCopy(item.props);
+        initUse.style = deepCopy(item.style);
+        initUse.events = deepCopy(item.events);
         initUse.label = item.label;
         return initUse;
       }
@@ -2694,8 +2694,8 @@ function getDesignEvents(name) {
     let items = assemblyGroups[i].items;
     for (let j = 0; j < items.length; j++) {
       let item = items[j];
-      if (item.name == name) {
-        return item.events;
+      if (item.name == name && item.events) {
+        return deepCopy(item.events);
       }
     }
   }

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

@@ -182,4 +182,20 @@ export declare function deleteRule(pageDesign: any, configure: any): void;
  * @param {*}
  * @return {*}
  */
-export declare function resetConfigIndo(configure: object, val: string): void;
+export declare function resetConfigIndo(configure: any, val: string): boolean;
+export declare function componentNameChange(configure: Component, componentName: any, emit: any): void;
+/**
+ * 获得引用表字段集合（例如：1对1子表字段、主表字段）
+ * @param configure 字段配置，主要使用prop属性名，例如：data.DEMO_SUPPPLIER.MY_NAME
+ * @param runtimePropMap
+ * @param oldProp 修改之前的属性名
+ * @return {tableName:[字段名,... ...],tableName:[字段名,... ...]}
+ */
+export declare function getRefrencePropMap(newProp: string, oldProp: string, runtimePropMap: any): void;
+/**
+ * 删除指定引用字段
+ * @param prop
+ * @param runtimePropMap
+ * @returns
+ */
+export declare function removePropFromRefrencePropMap(prop: string, runtimePropMap: any): void;

package/dist/es/components/design/utils/form-design-util.js

@@ -1,6 +1,9 @@
 import { usePageContextStore } from "../../../stores/page-store.js";
 import { getComponentOptionConfigs } from "super-page-runtime";
 import { getInitialInformationByName } from "./assemblys-config.js";
+import { deepCopy } from "./common-util.js";
+import { ElMessage } from "element-plus";
+import { tableResetConfigIndo } from "./page-table-util.js";
 function caculateDetailComponentStyle(configure, designStyle, designClass, designHeaderStyle) {
   const tempStyle = {};
   const tempHeaderStyle = {};
@@ -463,17 +466,122 @@ function packageStringRuleByDataType(fieldInfo, type, rule) {
 }
 function resetConfigIndo(configure, val) {
   let moduleInfo = getInitialInformationByName(val);
-  configure.props = moduleInfo.props;
-  configure.style = moduleInfo.style;
-  configure.events = moduleInfo.events;
-  configure.label = moduleInfo.label;
+  if (moduleInfo) {
+    const eventMap = changeEventToMap(moduleInfo.events);
+    let newEvents = {};
+    let isCanRest = true;
+    const bindEvents = configure.events.filter((event) => {
+      return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
+    });
+    if (bindEvents) {
+      for (let i = 0; i < bindEvents.length; i++) {
+        const item = bindEvents[i];
+        const event = eventMap[item.name];
+        if (event) {
+          newEvents[item.name] = deepCopy(item);
+        } else {
+          isCanRest = false;
+          ElMessage({
+            showClose: true,
+            message: "事件:[" + item.name + "]已绑定事件，请先备份事件内容，并清除绑定的事件，再切换组件类型",
+            type: "warning",
+            duration: 5e3
+          });
+          break;
+        }
+      }
+    }
+    if (isCanRest) {
+      let newEventsArr = [];
+      moduleInfo.events.forEach((item) => {
+        const eventName = item.name;
+        if (newEvents[eventName]) {
+          newEvents[eventName].componentUuid = configure.uuid;
+          newEvents[eventName].componentLabel = val;
+          newEvents[eventName].title = configure.props.base.title;
+          newEventsArr.push(newEvents[item.name]);
+        } else {
+          newEventsArr.push(item);
+        }
+      });
+      configure.name = val;
+      configure.events = newEventsArr;
+      Object.assign(moduleInfo.props, deepCopy(configure.props));
+      configure.props = moduleInfo.props;
+      Object.assign(moduleInfo.style, deepCopy(configure.style));
+      configure.style = moduleInfo.style;
+      configure.label = moduleInfo.label;
+      return true;
+    } else {
+      return false;
+    }
+  } else {
+    return false;
+  }
+}
+function changeEventToMap(events) {
+  let eventMap = {};
+  if (events) {
+    events.forEach((item) => {
+      eventMap[item.name] = item;
+    });
+  }
+  return eventMap;
+}
+function componentNameChange(configure, componentName, emit) {
+  let isCanReset = true;
+  if (configure.isTable) {
+    tableResetConfigIndo(configure, componentName);
+  } else {
+    isCanReset = resetConfigIndo(configure, componentName);
+  }
+  if (isCanReset) {
+    emit("changeAssembly", configure);
+  }
+}
+function getRefrencePropMap(newProp, oldProp, runtimePropMap) {
+  removePropFromRefrencePropMap(oldProp, runtimePropMap);
+  let props = [];
+  if (newProp) {
+    props = newProp.split(".");
+  }
+  if (props.length >= 3) {
+    const refrenceTableName = props[1];
+    const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
+    if (!runtimePropMap[refrenceTableName]) {
+      runtimePropMap[refrenceTableName] = [];
+    }
+    if (runtimePropMap[refrenceTableName].indexOf(fieldName) < 0) {
+      runtimePropMap[refrenceTableName].push(fieldName);
+    }
+  }
+}
+function removePropFromRefrencePropMap(prop, runtimePropMap) {
+  let props = [];
+  if (prop) {
+    props = prop.split(".");
+  }
+  if (props.length >= 3) {
+    const refrenceTableName = props[1];
+    const fieldName = props[2].substring(0, props[2].lastIndexOf("}"));
+    if (!runtimePropMap[refrenceTableName]) {
+      return;
+    }
+    if (runtimePropMap[refrenceTableName].indexOf(fieldName) > 0) {
+      const newArr = runtimePropMap[refrenceTableName].filter((item) => item !== fieldName);
+      runtimePropMap[refrenceTableName] = newArr;
+    }
+  }
 }
 export {
   caculateComponentProps,
   caculateDetailComponentStyle,
   columnCustomTittleClass,
   columnTittleStyle,
+  componentNameChange,
+  getRefrencePropMap,
   removComponentOptionConfigs,
+  removePropFromRefrencePropMap,
   resetConfigIndo,
   watchMaxOrMinValidate,
   watchPatternValidate,

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

@@ -97,6 +97,7 @@ export interface ComponentEvent extends Object {
     name: string;
     label: string;
     params?: ComponentEventParam[];
+    componentUuid?: string;
 }
 /**
  * 事件对象
@@ -248,7 +249,7 @@ export interface ListColumn {
     displayOrder: number;
     fileSet: string | null | undefined;
     orgTreeSet: string | null | undefined;
-    dynamicColumnJson?: string;
+    dynamicColumnJson?: string | null | undefined;
     valueSetOptions: string | null | undefined;
     required: boolean;
     pattern: string;

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

@@ -2,3 +2,4 @@ export declare function queryWorkflowsRequest(tableName: any, systemCode: any, p
 export declare function createWorkflowRequest(tableName: any, pageName: any, systemCode: any, publishVersion: any): any;
 export declare function getHighestVersionDefinition(wfDefinitionCode: any, defVersion: any, publishVersion: any): any;
 export declare function getPublishVersionsByCode(systemCode: any): any;
+export declare function deleteDesignItem(items: any, sourceItem: any, isShowChildrenTip: any, isDeleteSourceItem: boolean): void;

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

@@ -1,4 +1,6 @@
 import http from "agilebuilder-ui/src/utils/request";
+import { ElMessageBox } from "element-plus";
+import eventBus from "./eventBus.js";
 function queryWorkflowsRequest(tableName, systemCode, publishVersion) {
   const params = {
     appCode: systemCode,
@@ -32,8 +34,33 @@ function getHighestVersionDefinition(wfDefinitionCode, defVersion, publishVersio
     params
   );
 }
+function deleteDesignItem(items, sourceItem, isShowChildrenTip, isDeleteSourceItem) {
+  if (isShowChildrenTip) {
+    ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
+      confirmButtonText: "确认",
+      cancelButtonText: "取消",
+      type: "warning"
+    }).then(() => {
+      _deleteItem(items, sourceItem);
+    }).catch((err) => {
+      console.log(err);
+    });
+  } else if (isDeleteSourceItem) {
+    _deleteItem(items, sourceItem);
+  }
+}
+function _deleteItem(items, sourceItem) {
+  if (sourceItem && sourceItem.name === "table") {
+    eventBus.$off("reloadTable-" + sourceItem.uuid);
+  }
+  const index = items.indexOf(sourceItem);
+  if (index > -1) {
+    items.splice(index, 1);
+  }
+}
 export {
   createWorkflowRequest,
+  deleteDesignItem,
   getHighestVersionDefinition,
   queryWorkflowsRequest
 };

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

@@ -35,11 +35,14 @@ function setTableRuntimesFromConfigure(tableConfigure, pageDesign) {
   }
   pageDesign.tableRuntimes[configureCopy.uuid] = getListView(configureCopy, pageDesign, tableConfigureStr);
   delete tableConfigure.btnList;
-  delete tableConfigure.events;
   delete tableConfigure.items;
   delete tableConfigure.modelFields;
-  delete tableConfigure.props;
-  delete tableConfigure.runtime;
+  if (tableConfigure.runtime && tableConfigure.runtime.events) {
+    const { events } = tableConfigure.runtime;
+    tableConfigure.runtime = { events };
+  } else {
+    delete tableConfigure.runtime;
+  }
 }
 function getListView(configureCopy, pageDesign, tableConfigureStr) {
   const listCode = "V" + pageDesign.version + "__" + pageDesign.code + "__" + configureCopy.uuid;
@@ -158,7 +161,7 @@ function getListColumns(configure, pageDesign) {
       // 控件属性配置
       controlConfig: getControlConfig(item),
       //事件类型,json格式，格式为：{input:funName1,blur:funName2,focus:funName3,...}，funName1、funName2等方法名，通过列表的options.eventCallBack传入
-      // eventType: string
+      eventType: getListColumnEvent(item),
       /**
        * 显示顺序，多层级关系，可能值有重复
        * 如有第一层级的顺序1，有第二层级的顺序1
@@ -169,7 +172,7 @@ function getListColumns(configure, pageDesign) {
       //组织结构树参数设置
       orgTreeSet: getOrgTreeSet(item),
       // 字段为动态列时，json
-      // dynamicColumnJson: string
+      dynamicColumnJson: getDynamicColumnJson(item),
       // 值设置，设置多个
       valueSetOptions: getValueSetOptions(item),
       // 是否必填
@@ -189,9 +192,6 @@ function getListColumns(configure, pageDesign) {
        */
       // ifMultiData: boolean
     };
-    if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
-      formatDynamicColumnData(item, temp);
-    }
     listColumns.push(temp);
   });
   return listColumns;
@@ -426,8 +426,28 @@ function getNameFromProp(prop) {
   }
   return prop;
 }
-function formatDynamicColumnData(item, temp) {
-  temp.dynamicColumnJson = JSON.stringify(item.props.dataOrigin.dynamicColumnJson);
+function getListColumnEvent(item, pageDesign) {
+  let result = null;
+  if (item.events) {
+    item.events.forEach((event) => {
+      if (event.jsContent && event.jsContent.trim()) {
+        if (!result) {
+          result = {};
+        }
+        result[event.name] = event.componentUuid + "_" + event.name;
+      }
+    });
+    if (result) {
+      return JSON.stringify(result);
+    }
+  }
+  return result;
+}
+function getDynamicColumnJson(item) {
+  if (item.props.base.prop && item.props.base.prop === "dynamicColumnSelect") {
+    return JSON.stringify(item.props.dynamicColumnData);
+  }
+  return null;
 }
 function tableResetConfigIndo(configure, moduleValue) {
   let newColumnInfo = {
@@ -450,6 +470,7 @@ function tableResetConfigIndo(configure, moduleValue) {
   configure.props.verification = newColumnInfo.verification;
   configure.props.definition = newColumnInfo.definition;
   configure.events = getDesignEvents(moduleValue);
+  configure.name = "table";
 }
 export {
   querySublist,

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

@@ -91,7 +91,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.showCondition = JSON.stringify(table);
+      props.configure.props.base.showConditions = JSON.stringify(table);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -108,7 +108,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -230,15 +230,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
-                        createVNode(_component_el_button, {
-                          type: "primary",
-                          onClick: _cache[4] || (_cache[4] = ($event) => combinationVisible.value = true)
-                        }, {
-                          default: withCtx(() => [
-                            createTextVNode("编辑")
-                          ]),
-                          _: 1
-                        })
+                        (openBlock(), createBlock(_sfc_main$1, {
+                          key: __props.configure.uuid + "_show",
+                          configure: __props.configure,
+                          type: "showConditions"
+                        }, null, 8, ["configure"]))
                       ]),
                       _: 1
                     }),
@@ -249,7 +245,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_button, {
                           type: "primary",
-                          onClick: _cache[5] || (_cache[5] = ($event) => journalSetVisible.value = true)
+                          onClick: _cache[4] || (_cache[4] = ($event) => journalSetVisible.value = true)
                         }, {
                           default: withCtx(() => [
                             createTextVNode("编辑")
@@ -278,7 +274,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["pageDesign", "configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
-                conditionList: __props.configure.props.base.showCondition,
+                conditionList: __props.configure.props.base.showConditions,
                 fieldNameList: __props.pageDesign.modelFields,
                 fieldMap: __props.pageDesign.modelFieldsMap,
                 onSave: saveCondition,

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

@@ -2,7 +2,8 @@ import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock,
 import _sfc_main$1 from "../../object-design.vue.js";
 import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
 import { useDraggable } from "vue-draggable-plus";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "buttongroup-design",
   props: {
@@ -68,23 +69,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       items.splice(index, 0, copyObj);
     }
     function deleteItem(sourceItem) {
-      let items = btnItems;
-      ElMessageBox.confirm(
-        "还有子元素，确定要删除吗?",
-        "删除",
-        {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }
-      ).then(() => {
-        const index = items.indexOf(sourceItem);
-        if (index > -1) {
-          items.splice(index, 1);
-        }
-      }).catch((err) => {
-        console.log(err);
-      });
+      deleteDesignItem(btnItems, sourceItem, true, false);
     }
     return (_ctx, _cache) => {
       const _component_el_button_group = resolveComponent("el-button-group");

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

@@ -38,8 +38,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       if (props.conditionList) {
         tableData.value = JSON.parse(props.conditionList);
-      }
-      if (props.list) {
+      } else if (props.list) {
         tableData.value = props.list;
       }
     });
@@ -60,18 +59,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       operationArr.value.push([]);
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.propValue = modelValue;
     }
-    function changeFieldName(index, propName) {
-      const item = props.fieldMap[propName];
+    function changeFieldName(index, row, propDbName) {
+      const item = props.fieldMap[propDbName];
+      row["dataType"] = item.dataType;
+      row["propName"] = item.name;
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {
       if (tableData.value && tableData.value.length > 0) {
-        for (var i = 0; i < tableData.value.length; i++) {
+        for (let i = 0; i < tableData.value.length; i++) {
           const item = tableData.value[i];
-          if (!item.propName) {
-            return ElMessage.warning("字段名或值有空白");
+          if (!item.propName || !item.propValue) {
+            return ElMessage.warning("第" + i + "行字段名或值有空白");
           }
         }
       }
@@ -180,11 +181,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx((scope) => [
                   createVNode(_component_el_select, {
-                    modelValue: scope.row.propName,
-                    "onUpdate:modelValue": ($event) => scope.row.propName = $event,
+                    modelValue: scope.row.propDbName,
+                    "onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
                     clearable: "",
+                    filterable: "",
                     size: "default",
-                    onChange: ($event) => changeFieldName(scope.$index, scope.row.propName)
+                    onChange: ($event) => changeFieldName(scope.$index, scope.row, scope.row.propDbName)
                   }, {
                     default: withCtx(() => [
                       (openBlock(true), createElementBlock(Fragment, null, renderList(__props.fieldNameList, (item) => {
@@ -212,7 +214,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     size: "default"
                   }, {
                     default: withCtx(() => [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(operationArr.value[scope.$index], (option) => {
+                      (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getOperators)(scope.row), (option) => {
                         return openBlock(), createBlock(_component_el_option, {
                           key: option.name,
                           label: option.label,
@@ -231,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx((scope) => [
                   createVNode(BindVariable, {
-                    modelValue: scope.row.defaultValue,
+                    modelValue: scope.row.propValue,
                     "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
                   }, null, 8, ["modelValue", "onUpdate:modelValue"])
                 ]),

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

@@ -47,7 +47,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = true;
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.autoValue = modelValue;
     }
     function selectRow(row) {
       tableRef.value.setCurrentRow(row);
@@ -61,6 +61,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function add() {
       tableData.value.push({});
     }
+    function changeField(row, propDbName) {
+      console.log("changeField----props.pageDesign.modelFieldsMap=", props.pageDesign.modelFieldsMap, "propDbName=", propDbName);
+      const item = props.pageDesign.modelFieldsMap[propDbName];
+      row.field = item.name;
+      row.dataType = item.dataType;
+    }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_row = resolveComponent("el-row");
@@ -197,11 +203,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   }, {
                     default: withCtx((scope) => [
                       createVNode(_component_el_select, {
-                        modelValue: scope.row.field,
-                        "onUpdate:modelValue": ($event) => scope.row.field = $event,
+                        modelValue: scope.row.propDbName,
+                        "onUpdate:modelValue": ($event) => scope.row.propDbName = $event,
                         clearable: "",
                         size: "default",
-                        onFocus: ($event) => selectRow(scope.row)
+                        onFocus: ($event) => selectRow(scope.row),
+                        onChange: ($event) => changeField(scope.row, scope.row.propDbName)
                       }, {
                         default: withCtx(() => [
                           (openBlock(true), createElementBlock(Fragment, null, renderList(__props.pageDesign.modelFields, (item) => {
@@ -213,7 +220,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           }), 128))
                         ]),
                         _: 2
-                      }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus"])
+                      }, 1032, ["modelValue", "onUpdate:modelValue", "onFocus", "onChange"])
                     ]),
                     _: 1
                   }),
@@ -225,7 +232,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     default: withCtx((scope) => [
                       createVNode(BindVariable, {
                         onFocus: ($event) => selectRow(scope.row),
-                        modelValue: scope.row.defaultValue,
+                        modelValue: scope.row.autoValue,
                         "onUpdate:modelValue": (data) => afterBindDefaultValue(data, scope.row)
                       }, null, 8, ["onFocus", "modelValue", "onUpdate:modelValue"])
                     ]),

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

@@ -75,7 +75,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       combinationVisible.value = false;
     }
     function saveCondition(table) {
-      props.configure.props.base.showCondition = JSON.stringify(table);
+      props.configure.props.base.showConditions = JSON.stringify(table);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -216,7 +216,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["configure"])) : createCommentVNode("", true),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 2,
-                conditionList: __props.configure.props.base.showCondition,
+                conditionList: __props.configure.props.base.showConditions,
                 fieldNameList: attributeMap.value,
                 fieldMap: fieldMap.value,
                 onSave: saveCondition,