super-page-designer 2.0.51-beta2 → 2.0.54

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

@@ -1,11 +1,14 @@
 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 _sfc_main$4 from "../../common/common-attr-size.vue.js";
+import { resetConfigIndo } from "../../../../utils/form-design-util.js";
+import _sfc_main$5 from "../../common/common-attr-size.vue.js";
 import DataOrigin from "../common/data-origin.vue.js";
 import _sfc_main$2 from "../common/data-linkage.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$3 from "../common/title-suffix.vue.js";
+import { tableResetConfigIndo } from "../../../../utils/page-table-util.js";
+import _sfc_main$4 from "../common/verification-custom.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -15,10 +18,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       required: true
     },
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
+    },
     default: () => ({ props: {} })
   },
-  setup(__props) {
+  emits: ["changeAssembly"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const openCollapseItems = ref(["base"]);
     const isTable = ref(false);
     if (props.configure.isTable) {
@@ -36,6 +46,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function afterBindDefaultValue(modelValue) {
       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);
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -46,8 +64,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       const _component_el_checkbox = resolveComponent("el-checkbox");
-      const _component_el_col = resolveComponent("el-col");
-      const _component_el_button = resolveComponent("el-button");
       const _component_el_collapse = resolveComponent("el-collapse");
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -76,6 +92,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.name,
                           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          onChange: nameChange,
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [
@@ -491,30 +508,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       "label-width": "0"
                     }, {
                       default: withCtx(() => [
-                        createVNode(_component_el_col, { span: 8 }, {
-                          default: withCtx(() => [
-                            createVNode(_component_el_checkbox, {
-                              label: "自定义",
-                              value: "custom"
-                            })
-                          ]),
-                          _: 1
-                        }),
-                        createVNode(_component_el_col, { span: 14 }, {
-                          default: withCtx(() => [
-                            createVNode(_component_el_button, null, {
-                              default: withCtx(() => [
-                                createTextVNode("自定义逻辑")
-                              ]),
-                              _: 1
-                            }),
-                            createVNode(_component_el_button, {
-                              icon: _ctx.Search,
-                              circle: ""
-                            }, null, 8, ["icon"])
-                          ]),
-                          _: 1
-                        })
+                        createVNode(_sfc_main$4, {
+                          pageDesign: __props.pageDesign,
+                          verification: __props.configure.props.verification
+                        }, null, 8, ["pageDesign", "verification"])
                       ]),
                       _: 1
                     })
@@ -522,7 +519,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               })),
-              !isTable.value ? (openBlock(), createBlock(_sfc_main$4, {
+              !isTable.value ? (openBlock(), createBlock(_sfc_main$5, {
                 key: __props.configure.uuid,
                 size: __props.configure.props.size
               }, null, 8, ["size"])) : createCommentVNode("", true)

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./select-attr.vue2.js";
-/* empty css                 */
+import "./select-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -13,8 +13,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({ title: "Text", props: { type: "input-text" } })
       // 设置默认值
+    },
+    // 页面设计对象
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
     }
   },
+  emits: ["changeAssembly"],
   setup(__props) {
     let currentConfigType = ref("base");
     return (_ctx, _cache) => {
@@ -24,7 +31,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_2, [
-          withDirectives(createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$1, {
+            configure: __props.configure,
+            pageDesign: __props.pageDesign,
+            onChangeAssembly: _cache[1] || (_cache[1] = (val) => _ctx.$emit("changeAssembly", val))
+          }, null, 8, ["configure", "pageDesign"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
           withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [

package/dist/es/components/design/views/assemblys/form/select/select-attr.vue3.js

@@ -0,0 +1 @@
+

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

@@ -1,8 +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 _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({
@@ -14,8 +16,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     },
     default: () => ({ props: {} })
   },
-  setup(__props) {
+  emits: ["changeAssembly"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const openCollapseItems = ref(["base"]);
     const isTable = ref(false);
     if (props.configure.isTable) {
@@ -30,6 +34,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function afterBindDefaultValue(modelValue) {
       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);
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -71,6 +83,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.name,
                           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          onChange: nameChange,
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./switch-attr.vue2.js";
-/* empty css                 */
+import "./switch-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -24,7 +24,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_2, [
-          withDirectives(createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$1, {
+            configure: __props.configure,
+            onChangeAssembly: _cache[1] || (_cache[1] = (val) => _ctx.$emit("changeAssembly", val))
+          }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
           withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [

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

@@ -0,0 +1 @@
+

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

@@ -1,8 +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 _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",
@@ -13,9 +15,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     },
     default: () => ({ props: {} })
   },
-  setup(__props) {
+  emits: ["changeAssembly"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
     const openCollapseItems = ref(["base"]);
+    const emit = __emit;
     const isTable = ref(false);
     if (props.configure.isTable) {
       isTable.value = true;
@@ -29,6 +33,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function afterBindDefaultValue(modelValue) {
       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);
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -67,6 +79,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.name,
                           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          onChange: nameChange,
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./tag-attr.vue2.js";
-/* empty css              */
+import "./tag-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -24,7 +24,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_2, [
-          withDirectives(createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$1, {
+            configure: __props.configure,
+            onChangeAssembly: _cache[1] || (_cache[1] = (val) => _ctx.$emit("changeAssembly", val))
+          }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
           withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [

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

@@ -0,0 +1 @@
+

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

@@ -1,9 +1,12 @@
 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 _sfc_main$3 from "../../common/common-attr-size.vue.js";
+import { resetConfigIndo } 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" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -13,10 +16,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       required: true
     },
-    default: () => ({ props: {} })
+    default: () => ({ props: {} }),
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
+    }
   },
-  setup(__props) {
+  emits: ["changeAssembly"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
+    const emit = __emit;
     const openCollapseItems = ref(["base"]);
     const isTable = ref(false);
     if (props.configure.isTable) {
@@ -31,6 +41,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function afterBindDefaultValue(modelValue) {
       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);
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -43,7 +61,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_col = resolveComponent("el-col");
-      const _component_el_button = resolveComponent("el-button");
       const _component_el_collapse = resolveComponent("el-collapse");
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -72,6 +89,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_select, {
                           modelValue: __props.configure.name,
                           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
+                          onChange: nameChange,
                           placeholder: "请选择"
                         }, {
                           default: withCtx(() => [
@@ -454,30 +472,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       "label-width": "0"
                     }, {
                       default: withCtx(() => [
-                        createVNode(_component_el_col, { span: 8 }, {
-                          default: withCtx(() => [
-                            createVNode(_component_el_checkbox, {
-                              label: "自定义",
-                              value: "custom"
-                            })
-                          ]),
-                          _: 1
-                        }),
-                        createVNode(_component_el_col, { span: 14 }, {
-                          default: withCtx(() => [
-                            createVNode(_component_el_button, null, {
-                              default: withCtx(() => [
-                                createTextVNode("自定义逻辑")
-                              ]),
-                              _: 1
-                            }),
-                            createVNode(_component_el_button, {
-                              icon: _ctx.Search,
-                              circle: ""
-                            }, null, 8, ["icon"])
-                          ]),
-                          _: 1
-                        })
+                        createVNode(_sfc_main$3, {
+                          pageDesign: __props.pageDesign,
+                          verification: __props.configure.props.verification
+                        }, null, 8, ["pageDesign", "verification"])
                       ]),
                       _: 1
                     })
@@ -485,7 +483,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               })),
-              !isTable.value ? (openBlock(), createBlock(_sfc_main$3, {
+              !isTable.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: __props.configure.uuid,
                 size: __props.configure.props.size
               }, null, 8, ["size"])) : createCommentVNode("", true)

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./textarea-attr.vue2.js";
-/* empty css                   */
+import "./textarea-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -13,6 +13,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({ title: "Text", props: { type: "input-text" } })
       // 设置默认值
+    },
+    // 页面设计对象
+    pageDesign: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   setup(__props) {
@@ -24,7 +30,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_2, [
-          withDirectives(createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$1, {
+            configure: __props.configure,
+            pageDesign: __props.pageDesign,
+            onChangeAssembly: _cache[1] || (_cache[1] = (val) => _ctx.$emit("changeAssembly", val))
+          }, null, 8, ["configure", "pageDesign"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
           withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [

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

@@ -0,0 +1 @@
+

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

@@ -1,11 +1,14 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, unref, Fragment, renderList, createBlock, createTextVNode, toDisplayString, createElementVNode } from "vue";
 import { ElMessage } from "element-plus";
+import _sfc_main$1 from "../../common/common-select-table.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
+import { usePageContextStore } from "../../../../../../stores/page-store.js";
+import { queryTableFields } from "../../../../utils/page-table-util.js";
 import { Search, Close } from "@element-plus/icons-vue";
 const _hoisted_1 = /* @__PURE__ */ createElementVNode("div", { style: { "display": "block" } }, [
-  /* @__PURE__ */ createElementVNode("div", null, "1. 静态默认参数设置：$year年，$month月，$quarter季，$date天，$hour12(小时，12小时制)，$hour24(小时，24小时制)，$minute分"),
+  /* @__PURE__ */ createElementVNode("div", null, " 1. 静态默认参数设置：$year年，$month月，$quarter季，$date天，$hour12(小时，12小时制)，$hour24(小时，24小时制)，$minute分 "),
   /* @__PURE__ */ createElementVNode("div", null, "2. 表单支态参数设置：格式为，如：BPPJ-${factory}-$year-$month;"),
-  /* @__PURE__ */ createElementVNode("div", null, "3. 编号规则设置必须带有流水号 ，流水号以X表示，如三位流水号，则以三个XXX表示：BPPJ-${factory}-$year-$month-XXX")
+  /* @__PURE__ */ createElementVNode("div", null, " 3. 编号规则设置必须带有流水号 ，流水号以X表示，如三位流水号，则以三个XXX表示：BPPJ-${factory}-$year-$month-XXX ")
 ], -1);
 const _hoisted_2 = /* @__PURE__ */ createElementVNode("div", null, "1. 为hql 语句 前辍为t 如：t.factory = 'B1' or t.factory = 'B2'", -1);
 const _hoisted_3 = { class: "operation-area operation-area-float" };
@@ -28,7 +31,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["open", "opend", "closed", "close"],
   setup(__props, { emit: __emit }) {
     const props = __props;
+    const pageDesignUtil = usePageContextStore();
+    const pageDesign = pageDesignUtil.pageContext;
     const $emit = __emit;
+    const selectTableDialog = ref(null);
     const tableColumnData = ref([]);
     const basicInformation = [
       { label: "年", value: "$year" },
@@ -45,15 +51,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { label: "初始化时", value: "initialization" },
       { label: "保存时", value: "whenSaving" }
     ];
-    ref(false);
     const settingFormNoRuleBase = ref({
       differentDataReset: false,
       continuousMatch: false,
       publishVersion: "",
       enerationMode: "whenSaving"
     });
-    const form = ref(null);
-    ref(null);
+    const form = ref({});
     onMounted(() => {
       settingFormNoRuleBase.value.publishVersion = props.publishVersion;
     });
@@ -76,7 +80,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function save() {
-      form.value.validate((valid) => {
+      var _a;
+      (_a = form.value) == null ? void 0 : _a.validate((valid) => {
         if (valid) {
           if (settingFormNoRuleBase.value["field"]) {
             const fields = settingFormNoRuleBase.value["field"].split(",");
@@ -84,10 +89,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             settingFormNoRuleBase.value["fieldName"] = fields[1];
           }
           if (settingFormNoRuleBase.value["id"]) {
-            update(
-              settingFormNoRuleBase.value["id"],
-              settingFormNoRuleBase.value
-            ).then((data) => {
+            update(settingFormNoRuleBase.value["id"], settingFormNoRuleBase.value).then((data) => {
               settingFormNoRuleBase.value = data;
               settingFormNoRuleBase.value["field"] = settingFormNoRuleBase.value["field"] + "," + settingFormNoRuleBase.value["fieldName"];
               ElMessage({
@@ -122,6 +124,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         settingFormNoRuleBase.value["ruleSet"] = value.value;
       }
     }
+    function selectTable() {
+      selectTableDialog.value.openDialog();
+    }
+    function clearTable() {
+      settingFormNoRuleBase.value.entityTableCode = "";
+      settingFormNoRuleBase.value.entityTableName = "";
+      tableColumnData.value = [];
+    }
+    function onSelectTable(tableInfo) {
+      settingFormNoRuleBase.value.entityTableAlias = tableInfo.alias;
+      let hisKey = settingFormNoRuleBase.value.entityTableCode ? settingFormNoRuleBase.value.entityTableCode : "";
+      hisKey += "_";
+      hisKey += settingFormNoRuleBase.value.systemCode ? settingFormNoRuleBase.value.systemCode : "";
+      let newKey = tableInfo.name ? tableInfo.name : "";
+      newKey += "_";
+      newKey += tableInfo.systemCode ? tableInfo.systemCode : "";
+      if (newKey != hisKey) {
+        settingFormNoRuleBase.value.entityTableCode = tableInfo.name;
+        settingFormNoRuleBase.value.systemCode = tableInfo.systemCode;
+        const systemCode = tableInfo.systemCode ? tableInfo.systemCode : pageDesign.systemCode;
+        const systemVersion = tableInfo.systemVersion ? tableInfo.systemVersion : pageDesign.systemVersion;
+        queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
+          tableColumnData.value = tableFields;
+        });
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -228,18 +256,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                   modelValue: settingFormNoRuleBase.value.entityTableCode,
                                   "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => settingFormNoRuleBase.value.entityTableCode = $event),
                                   title: settingFormNoRuleBase.value.entityTableCode,
+                                  onClick: selectTable,
                                   clearable: "",
                                   readonly: "true"
                                 }, {
                                   append: withCtx(() => [
                                     createVNode(_component_el_button, {
                                       icon: unref(Search),
-                                      size: "small"
+                                      size: "small",
+                                      onClick: selectTable
                                     }, null, 8, ["icon"]),
                                     createVNode(_component_el_button, {
                                       icon: unref(Close),
                                       title: "Clear",
-                                      size: "small"
+                                      size: "small",
+                                      onClick: clearTable
                                     }, null, 8, ["icon"])
                                   ]),
                                   _: 1
@@ -253,7 +284,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_component_el_col, { span: 12 }, {
                           default: withCtx(() => [
                             createVNode(_component_el_form_item, {
-                              label: "实体字段",
+                              label: "编号字段",
                               rules: [
                                 {
                                   required: true,
@@ -270,14 +301,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                   "allow-create": "",
                                   clearable: "",
                                   filterable: "",
+                                  placeholder: "请选择",
                                   style: { "padding-left": "10px" }
                                 }, {
                                   default: withCtx(() => [
                                     (openBlock(true), createElementBlock(Fragment, null, renderList(tableColumnData.value, (item) => {
                                       return openBlock(), createBlock(_component_el_option, {
-                                        key: item.value,
-                                        label: item.label,
-                                        value: item.value
+                                        key: item.dbColumnName,
+                                        label: item.alias + " " + (item.dbColumnName === item.alias ? "" : item.dbColumnName),
+                                        value: item.dbColumnName
                                       }, null, 8, ["label", "value"]);
                                     }), 128))
                                   ]),
@@ -460,14 +492,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 onClick: goback
               }, {
                 default: withCtx(() => [
-                  createTextVNode(" 返回 ")
+                  createTextVNode(" 关闭 ")
                 ]),
                 _: 1
               })
             ])
           ]),
           _: 1
-        })
+        }),
+        createVNode(_sfc_main$1, {
+          ref_key: "selectTableDialog",
+          ref: selectTableDialog,
+          onSelectTable,
+          systemCode: unref(pageDesign).systemCode,
+          systemVersion: unref(pageDesign).systemVersion
+        }, null, 8, ["systemCode", "systemVersion"])
       ]);
     };
   }

package/dist/es/components/design/views/assemblys/page/component/weight-field-input.vue.js

@@ -42,7 +42,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     function fieldChange(val, row) {
       row.fieldalias = "";
-      if (val.length == 0) return;
+      if (val.length == 0)
+        return;
       props.fieldList.forEach((item) => {
         val.forEach((Ttem) => {
           if (item.dbColumnName === Ttem) {