super-page-designer 2.0.78 → 2.0.82

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

@@ -1,10 +1,9 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
-import { resetConfigIndo } from "../../../../utils/form-design-util.js";
+import { componentNameChange } from "../../../../utils/form-design-util.js";
 import _sfc_main$2 from "../../common/common-attr-size.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
-import { tableResetConfigIndo } from "../../../../utils/page-table-util.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -19,6 +18,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["changeAssembly"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const componentName = ref(props.configure.name);
     const emit = __emit;
     const openCollapseItems = ref(["base"]);
     const isTable = ref(false);
@@ -35,12 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.base.defaultValue = modelValue;
     }
     function nameChange(val) {
-      if (props.configure.isTable) {
-        tableResetConfigIndo(props.configure, val);
-      } else {
-        resetConfigIndo(props.configure, val);
-      }
-      emit("changeAssembly", props.configure);
+      componentNameChange(props.configure, val, emit);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -81,8 +76,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.name,
-                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          modelValue: componentName.value,
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => componentName.value = $event),
                           onChange: nameChange,
                           placeholder: "请选择"
                         }, {
@@ -135,10 +130,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         (openBlock(), createBlock(BindVariable, {
+                          isTable: __props.configure.isTable,
                           key: __props.configure.uuid,
                           modelValue: __props.configure.props.base.defaultValue,
                           "onUpdate:modelValue": afterBindDefaultValue
-                        }, null, 8, ["modelValue"]))
+                        }, null, 8, ["isTable", "modelValue"]))
                       ]),
                       _: 1
                     }),

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

@@ -1,10 +1,9 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
-import { resetConfigIndo } from "../../../../utils/form-design-util.js";
+import { componentNameChange } from "../../../../utils/form-design-util.js";
 import _sfc_main$2 from "../../common/common-attr-size.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
-import { tableResetConfigIndo } from "../../../../utils/page-table-util.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "tag-attr-base",
@@ -18,6 +17,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["changeAssembly"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const componentName = ref(props.configure.name);
     const openCollapseItems = ref(["base"]);
     const emit = __emit;
     const isTable = ref(false);
@@ -34,12 +34,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.base.defaultValue = modelValue;
     }
     function nameChange(val) {
-      if (props.configure.isTable) {
-        tableResetConfigIndo(props.configure, val);
-      } else {
-        resetConfigIndo(props.configure, val);
-      }
-      emit("changeAssembly", props.configure);
+      componentNameChange(props.configure, val, emit);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -77,8 +72,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.name,
-                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          modelValue: componentName.value,
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => componentName.value = $event),
                           onChange: nameChange,
                           placeholder: "请选择"
                         }, {
@@ -131,10 +126,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         (openBlock(), createBlock(BindVariable, {
+                          isTable: __props.configure.isTable,
                           key: __props.configure.uuid,
                           modelValue: __props.configure.props.base.defaultValue,
                           "onUpdate:modelValue": afterBindDefaultValue
-                        }, null, 8, ["modelValue"]))
+                        }, null, 8, ["isTable", "modelValue"]))
                       ]),
                       _: 1
                     }),

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

@@ -1,11 +1,10 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
-import { resetConfigIndo } from "../../../../utils/form-design-util.js";
+import { componentNameChange } from "../../../../utils/form-design-util.js";
 import _sfc_main$4 from "../../common/common-attr-size.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
 import _sfc_main$2 from "../common/title-suffix.vue.js";
-import { tableResetConfigIndo } from "../../../../utils/page-table-util.js";
 import _sfc_main$3 from "../common/verification-custom.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -26,6 +25,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["changeAssembly"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const componentName = ref(props.configure.name);
     const emit = __emit;
     const openCollapseItems = ref(["base"]);
     const isTable = ref(false);
@@ -42,12 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.base.defaultValue = modelValue;
     }
     function nameChange(val) {
-      if (props.configure.isTable) {
-        tableResetConfigIndo(props.configure, val);
-      } else {
-        resetConfigIndo(props.configure, val);
-      }
-      emit("changeAssembly", props.configure);
+      componentNameChange(props.configure, val, emit);
     }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
@@ -87,8 +82,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_select, {
-                          modelValue: __props.configure.name,
-                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          modelValue: componentName.value,
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => componentName.value = $event),
                           onChange: nameChange,
                           placeholder: "请选择"
                         }, {
@@ -141,10 +136,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         (openBlock(), createBlock(BindVariable, {
+                          isTable: __props.configure.isTable,
                           key: __props.configure.uuid,
                           modelValue: __props.configure.props.base.defaultValue,
                           "onUpdate:modelValue": afterBindDefaultValue
-                        }, null, 8, ["modelValue"]))
+                        }, null, 8, ["isTable", "modelValue"]))
                       ]),
                       _: 1
                     }),

package/dist/es/components/design/views/assemblys/page/component/setting-form-rule-base-input.vue.d.ts

@@ -11,6 +11,10 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: any;
     };
+    systemCode: {
+        type: StringConstructor;
+        default: any;
+    };
 }, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     close: (...args: any[]) => void;
     open: (...args: any[]) => void;
@@ -29,12 +33,17 @@ declare const _default: import('vue').DefineComponent<{
         type: NumberConstructor;
         default: any;
     };
+    systemCode: {
+        type: StringConstructor;
+        default: any;
+    };
 }>> & {
     onClose?: (...args: any[]) => any;
     onOpen?: (...args: any[]) => any;
     onOpend?: (...args: any[]) => any;
     onClosed?: (...args: any[]) => any;
 }, {
+    systemCode: string;
     code: string;
     rowId: number;
     publishVersion: number;

package/dist/es/components/design/views/assemblys/page/component/setting-form-rule-base-input.vue.js

@@ -26,6 +26,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     publishVersion: {
       type: Number,
       default: null
+    },
+    systemCode: {
+      type: String,
+      default: null
     }
   },
   emits: ["open", "opend", "closed", "close"],
@@ -55,17 +59,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       differentDataReset: false,
       continuousMatch: false,
       publishVersion: "",
+      systemCode: "",
       enerationMode: "whenSaving"
     });
     const form = ref({});
     onMounted(() => {
       settingFormNoRuleBase.value.publishVersion = props.publishVersion;
+      settingFormNoRuleBase.value.systemCode = props.systemCode;
     });
     function create(data) {
       return http.post(window["$vueApp"].config.globalProperties.baseAPI + "/mms/setting-form-rule-base", data);
     }
     function update(id, data) {
-      return http.put(window["$vueApp"].config.globalProperties.baseAPI + `/mms/setting-form-rule-base/${id}`);
+      return http.put(window["$vueApp"].config.globalProperties.baseAPI + `/mms/setting-form-rule-base/${id}`, data);
     }
     function preview(data) {
       return http.post(window["$vueApp"].config.globalProperties.baseAPI + "/mms/setting-form-rule-base/preview", data);
@@ -83,15 +89,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       var _a;
       (_a = form.value) == null ? void 0 : _a.validate((valid) => {
         if (valid) {
-          if (settingFormNoRuleBase.value["field"]) {
-            const fields = settingFormNoRuleBase.value["field"].split(",");
-            settingFormNoRuleBase.value["field"] = fields[0];
-            settingFormNoRuleBase.value["fieldName"] = fields[1];
+          const fieldDbName = settingFormNoRuleBase.value["field"];
+          if (fieldDbName) {
+            const column = tableColumnData.value.filter((item) => item.dbColumnName && item.dbColumnName === fieldDbName);
+            if (column && column.length > 0) {
+              settingFormNoRuleBase.value["fieldName"] = column[0]["name"];
+            }
           }
           if (settingFormNoRuleBase.value["id"]) {
+            console.log("修改表单编号规则---settingFormNoRuleBase.value===", settingFormNoRuleBase.value);
             update(settingFormNoRuleBase.value["id"], settingFormNoRuleBase.value).then((data) => {
               settingFormNoRuleBase.value = data;
-              settingFormNoRuleBase.value["field"] = settingFormNoRuleBase.value["field"] + "," + settingFormNoRuleBase.value["fieldName"];
               ElMessage({
                 showClose: true,
                 message: "保存成功",
@@ -99,9 +107,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               });
             });
           } else {
+            settingFormNoRuleBase.value.systemCode = props.systemCode;
+            console.log("创建表单编号规则---settingFormNoRuleBase.value===", settingFormNoRuleBase.value);
             create(settingFormNoRuleBase.value).then((data) => {
               settingFormNoRuleBase.value = data;
-              settingFormNoRuleBase.value["field"] = settingFormNoRuleBase.value["field"] + "," + settingFormNoRuleBase.value["fieldName"];
               ElMessage({
                 showClose: true,
                 message: "保存成功",
@@ -115,7 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function goback() {
-      $emit("close");
+      $emit("close", settingFormNoRuleBase.value.ruleCode);
     }
     function clickBasic(value) {
       if (settingFormNoRuleBase.value["ruleSet"]) {
@@ -133,13 +142,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableColumnData.value = [];
     }
     function onSelectTable(tableInfo) {
+      const initSystemCode = settingFormNoRuleBase.value.systemCode ? settingFormNoRuleBase.value.systemCode : "";
       settingFormNoRuleBase.value.entityTableAlias = tableInfo.alias;
       let hisKey = settingFormNoRuleBase.value.entityTableCode ? settingFormNoRuleBase.value.entityTableCode : "";
       hisKey += "_";
-      hisKey += settingFormNoRuleBase.value.systemCode ? settingFormNoRuleBase.value.systemCode : "";
+      hisKey += initSystemCode;
       let newKey = tableInfo.name ? tableInfo.name : "";
       newKey += "_";
-      newKey += tableInfo.systemCode ? tableInfo.systemCode : "";
+      newKey += tableInfo.systemCode ? tableInfo.systemCode : initSystemCode;
+      console.log("onSelectTable----newKey=", newKey, "hisKey=", hisKey);
       if (newKey != hisKey) {
         settingFormNoRuleBase.value.entityTableCode = tableInfo.name;
         settingFormNoRuleBase.value.systemCode = tableInfo.systemCode;

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

@@ -72,7 +72,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props["judgeHeavyList"] = tabValue;
       WeightFieldInputClose();
     }
-    function getRuleClose() {
+    function getRuleClose(formNoRuleCode) {
+      if (formNoRuleCode && !props.configure.props.formNoRuleCode) {
+        props.configure.props.formNoRuleCode = formNoRuleCode;
+      }
+      initFormNoRules();
       settingFormRuleBaseInputVisile.value = false;
     }
     function trimString(event) {
@@ -239,10 +243,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, 8, ["modelValue"]),
           settingFormRuleBaseInputVisile.value ? (openBlock(), createBlock(_sfc_main$2, {
             key: 0,
-            code: _ctx.configure.code,
+            code: _ctx.configure.props.formNoRuleCode,
             publishVersion: _ctx.configure.systemVersion,
+            systemCode: _ctx.configure.systemCode,
             onClose: getRuleClose
-          }, null, 8, ["code", "publishVersion"])) : createCommentVNode("", true),
+          }, null, 8, ["code", "publishVersion", "systemCode"])) : createCommentVNode("", true),
           WeightFieldInputVisile.value ? (openBlock(), createBlock(_sfc_main$3, {
             key: 1,
             judgeHeavyList: _ctx.configure.props.judgeHeavyList,

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

@@ -64,16 +64,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       operationArr.value.push([]);
     }
     function afterBindDefaultValue(modelValue, row) {
-      row.defaultValue = modelValue;
+      row.propValue = modelValue;
     }
-    function changeFieldName(index, propName) {
+    function changeFieldName(index, row, propDbName) {
       console.log("%c描述-164035", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.fieldMap);
-      const item = props.fieldMap[propName];
+      const item = props.fieldMap[propDbName];
       if (item.type === "date") {
         tableData.value[index].isData = true;
       } else {
         tableData.value[index].isData = false;
       }
+      row.propName = item.name;
+      row.dataType = item.dataType;
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {
@@ -231,11 +233,11 @@ 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: "",
                     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, index) => {
@@ -285,7 +287,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 default: withCtx((scope) => [
                   createVNode(BindVariable, {
                     size: "default",
-                    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/design/page-design.vue.js

@@ -88,6 +88,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
         queryTableFields(systemCode, systemVersion, pageDesign2.tableName).then((tableFields) => {
           pageDesign2.modelFields = tableFields;
+          pageDesign2.modelFieldsMap = {};
+          tableFields.forEach((item) => {
+            pageDesign2.modelFieldsMap[item.dbColumnName] = item;
+          });
           pageDesignUtil.setPageContext(pageDesign2);
         });
       }

package/dist/es/components/design/views/design/page-event/config.vue.js

@@ -1,7 +1 @@
-import _sfc_main from "./config.vue3.js";
-import "./config.vue2.js";
-import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
-export {
-  config as default
-};
+

package/dist/es/components/design/views/design/page-event/config.vue2.js

@@ -1 +1,7 @@
-
+import _sfc_main from "./config.vue3.js";
+import "./config.vue.js";
+import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
+const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
+export {
+  config as default
+};

package/dist/es/components/design/views/design/page-event/page-event-content.vue.js

@@ -1,8 +1,8 @@
 import { defineComponent, ref, onMounted, onUnmounted, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, withCtx, withDirectives, vShow, unref, createTextVNode, toDisplayString, Fragment, renderList, createBlock } from "vue";
 import { ElMessageBox, ElMessage } from "element-plus";
-import config from "./config.vue.js";
+import config from "./config.vue2.js";
 import { standardButtonOperations } from "../../../utils/assemblys-config.js";
-import { getUuidv4, deepCopy } from "../../../utils/common-util.js";
+import { findDesignItemByUuid, getUuidv4, deepCopy } from "../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
 import { undoRedo } from "../../../../../stores/event-undo-redo-store.js";
 import eventBus from "../../../utils/eventBus.js";
@@ -151,21 +151,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const tempObj = tempEvent.value;
       let hisEvent = null;
-      for (let e of pageDesign.customEvents) {
-        if (tempObj.name == "customFunc") {
+      let currentEventIndex = -1;
+      for (let index = 0; index < pageDesign.customEvents.length; index++) {
+        const e = pageDesign.customEvents[index];
+        if (tempObj.name === "customFunc") {
           if (e.uuid == tempObj.uuid) {
             hisEvent = e;
+            currentEventIndex = index;
             break;
           }
         } else {
           if (e.componentUuid == tempObj.componentUuid && e.name == tempObj.name) {
             hisEvent = e;
+            currentEventIndex = index;
             break;
           }
         }
       }
       if (hisEvent) {
         Object.assign(hisEvent, tempObj);
+        pageDesign.customEvents[currentEventIndex] = hisEvent;
+        if (hisEvent.name !== "customFunc" && hisEvent.componentUuid) {
+          const itemConfig = findDesignItemByUuid(pageDesign, hisEvent.componentUuid);
+          if (itemConfig && itemConfig.events) {
+            const eventIndex = itemConfig.events.findIndex(
+              (e) => e.name == hisEvent.name && e.componentUuid == hisEvent.componentUuid
+            );
+            if (eventIndex > -1) {
+              itemConfig.events[eventIndex] = hisEvent;
+            }
+          }
+        }
       } else {
         Object.assign(editEvent.value, tempObj);
         pageDesign.customEvents.push(editEvent.value);
@@ -280,12 +296,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               event2.remark = "";
               event2.standardValues = [];
               pageDesign.customEvents.splice(i, 1);
+              deleteComponentEvent(tempObj);
               break;
             }
           }
         }
       }
     }
+    function deleteComponentEvent(event) {
+      const pageDesign = pageDesignUtil.pageContext;
+      const itemConfig = findDesignItemByUuid(pageDesign, event.componentUuid);
+      if (itemConfig && itemConfig.events) {
+        const eventIndex = itemConfig.events.findIndex(
+          (e) => e.name == event.name && e.componentUuid == event.componentUuid
+        );
+        if (eventIndex > -1) {
+          itemConfig.events.splice(eventIndex, 1);
+        }
+      }
+    }
     function validateBeforeSave() {
       const tempObj = tempEvent.value;
       if (!tempObj.isStandard) {

package/dist/es/components/design/views/design/view/attr-container.vue.js

@@ -35,7 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cacheComponent = {};
     function changeAssembly(configure) {
       console.log("%c描述-103213", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", configure);
-      if (!configure || !configure.name || configure.name == "page") {
+      if (!configure || !configure.name || configure.name === "page") {
         dynamicConfigure.value = props.pageInfo;
         dynamicComponent.value = _sfc_main$1;
       } else {

package/dist/es/components/design/views/design/view/page-switch.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./page-switch.vue2.js";
 import "./page-switch.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const PageSwitch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a7c905da"]]);
+const PageSwitch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-56a8e877"]]);
 export {
   PageSwitch as default
 };

package/dist/es/components/design/views/design/view/page-switch.vue2.js

@@ -111,10 +111,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           reference: withCtx(() => [
             createVNode(_component_el_button, {
-              color: "#eee",
               icon: unref(Operation),
-              style: { "width": "150px", "font-size": "14px", "font-weight": "600" },
-              type: "primary"
+              style: { "width": "150px", "font-size": "14px", "font-weight": "600" }
             }, {
               default: withCtx(() => [
                 createTextVNode(toDisplayString(__props.pageDesign.label + "(" + __props.pageDesign.version + ")") + " ", 1),

package/dist/es/components/design/views/design/view/view-design-display.vue.js

@@ -6,7 +6,7 @@ import { deepCopy, getUuidv4, findDesignItemByUuid } from "../../../utils/common
 import { addComponentRef } from "../../../utils/page-helper-util.js";
 import { caculatePageStyle } from "../../../utils/container-design-util.js";
 import _sfc_main$2 from "./view-design-preview.vue.js";
-import { ElMessageBox, ElMessage } from "element-plus";
+import { ElMessage } from "element-plus";
 import "@vueuse/core";
 import "@element-plus/icons-vue";
 import "codemirror";
@@ -15,7 +15,7 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-import "../page-event/config.vue2.js";
+import "../page-event/config.vue.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";
@@ -23,6 +23,7 @@ import "../../../utils/eventBus.js";
 import _sfc_main$3 from "./components/quick-add-dialog.vue.js";
 import { setTableRuntimesFromConfigure } from "../../../utils/page-table-util.js";
 import http from "agilebuilder-ui/src/utils/request";
+import { deleteDesignItem } from "../../../utils/page-design-util.js";
 const _hoisted_1 = { class: "amb-design-content-center-header" };
 const _hoisted_2 = { class: "amb-design-tool" };
 const _hoisted_3 = { class: "amb-design-tool-item" };
@@ -141,25 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageItems.splice(index, 0, copyObj);
     }
     function deleteItem(sourceItem) {
-      if (sourceItem.items && sourceItem.items.length > 0) {
-        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _deleteItem(sourceItem);
-        }).catch((err) => {
-          console.log(err);
-        });
-      } else {
-        _deleteItem(sourceItem);
-      }
-    }
-    function _deleteItem(sourceItem) {
-      const index = pageItems.indexOf(sourceItem);
-      if (index > -1) {
-        pageItems.splice(index, 1);
-      }
+      deleteDesignItem(pageItems, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     const pageDesignBoardMain = ref(null);
     useDraggable(pageDesignBoardMain, pageItems, {

package/dist/es/stores/table-store.js

@@ -7,10 +7,9 @@ const tableField = defineStore("dataOptions", () => {
     let arr = [];
     tableFields.forEach((item) => {
       arr.push({
-        value: item.name,
+        value: item.dbColumnName,
         label: item.alias,
-        alias: item.alias,
-        dbColumnName: item.dbColumnName
+        alias: item.alias
       });
     });
     fieldList.value = arr;