super-page-designer 2.0.96 → 2.0.99

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

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, renderSlot } from "vue";
-import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue2.js";
+import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
 import { Codemirror } from "vue-codemirror";
 import _sfc_main$6 from "../../workflow/component/combination.vue.js";
 import _sfc_main$5 from "./return-set-table.vue.js";

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

@@ -47,8 +47,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let clolumnTableFields = ref([]);
     const groupTitleValueSet = ref({});
     function dynamicColumnDataSourcesChange(value) {
+      var _a;
       if (value === "service" && !props.configure.props.dynamicColumnData.service) {
         props.configure.props.dynamicColumnData.service = {};
+      } else if (value === "dataTable") {
+        queryTableFieldsByTable();
+      } else if (value === "optionGroup") {
+        props.configure.props.dynamicColumnData.optionGroup = "";
+      }
+      if (value === "optionGroup" && ((_a = props.configure.props.dynamicColumnData) == null ? void 0 : _a.mergeFieldType) === "more") {
+        props.configure.props.dynamicColumnData.mergeFieldLabelTemp = "选项值";
+        props.configure.props.dynamicColumnData.mergeField = "_optionValue_";
+      } else {
+        delete props.configure.props.dynamicColumnData.mergeFieldLabelTemp;
+        delete props.configure.props.dynamicColumnData.mergeField;
       }
     }
     const queryOptionGroupLoading = ref(false);
@@ -652,7 +664,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   class: "amb-design-attr-item"
                 }, {
                   default: withCtx(() => [
-                    createVNode(_component_el_select, {
+                    __props.configure.props.dynamicColumnData.dataSources === "dataTable" ? (openBlock(), createBlock(_component_el_select, {
+                      key: 0,
                       modelValue: __props.configure.props.dynamicColumnData.mergeField,
                       "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.dynamicColumnData.mergeField = $event),
                       filterable: "",
@@ -669,7 +682,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }), 128))
                       ]),
                       _: 1
-                    }, 8, ["modelValue"])
+                    }, 8, ["modelValue"])) : __props.configure.props.dynamicColumnData.dataSources === "optionGroup" ? (openBlock(), createBlock(_component_el_input, {
+                      key: 1,
+                      disabled: true,
+                      modelValue: __props.configure.props.dynamicColumnData.mergeFieldLabelTemp,
+                      "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.dynamicColumnData.mergeFieldLabelTemp = $event)
+                    }, null, 8, ["modelValue"])) : __props.configure.props.dynamicColumnData.dataSources === "sql" ? (openBlock(), createBlock(_component_el_input, {
+                      key: 2,
+                      modelValue: __props.configure.props.dynamicColumnData.mergeField,
+                      "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => __props.configure.props.dynamicColumnData.mergeField = $event)
+                    }, null, 8, ["modelValue"])) : createCommentVNode("", true)
                   ]),
                   _: 1
                 })) : createCommentVNode("", true),
@@ -682,7 +704,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_el_select, {
                       modelValue: __props.configure.props.dynamicColumnData.mergeTitleContentJoinField,
-                      "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.dynamicColumnData.mergeTitleContentJoinField = $event),
+                      "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => __props.configure.props.dynamicColumnData.mergeTitleContentJoinField = $event),
                       filterable: "",
                       clearable: "",
                       placeholder: "请选择"

package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createCommentVNode, withDirectives, createTextVNode, createElementBlock, Fragment, renderList, vShow, normalizeClass } from "vue";
-import _sfc_main$3 from "./dataorigin-input-table.vue2.js";
+import _sfc_main$3 from "./dataorigin-input-table.vue.js";
 import _sfc_main$2 from "./condition.vue.js";
 import _sfc_main$1 from "./row-ul-li.vue.js";
 import "uuid";

package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue.js

@@ -1,4 +1,155 @@
-import _sfc_main from "./dataorigin-input-table.vue2.js";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, unref, createElementVNode, createTextVNode } from "vue";
+import { Search } from "@element-plus/icons-vue";
+const _hoisted_1 = { class: "dialog-footer" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "dataorigin-input-table",
+  props: {
+    modelValue: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const inputValue = ref(props.modelValue);
+    const emit = __emit;
+    const tableData = [
+      {
+        id: 1,
+        date: "2016-05-03",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 2,
+        date: "2016-05-02",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 3,
+        date: "2016-05-04",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 4,
+        date: "2016-05-01",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      }
+    ];
+    const dialogVisible = ref(false);
+    const selectData = ref([]);
+    watch(() => props.modelValue, (newVal) => {
+      inputValue.value = newVal;
+    });
+    function confirm() {
+      if (selectData.value.length > 0) {
+        let str = "";
+        selectData.value.forEach((item) => {
+          str = str + item.name + ",";
+        });
+        str = str.substring(0, str.length - 1);
+        emit("update:modelValue", str);
+        dialogVisible.value = false;
+      } else {
+        dialogVisible.value = false;
+      }
+    }
+    function handleSelectionChange(selection) {
+      selectData.value = selection;
+    }
+    function inputClick() {
+      dialogVisible.value = true;
+    }
+    return (_ctx, _cache) => {
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_input = resolveComponent("el-input");
+      const _component_el_table_column = resolveComponent("el-table-column");
+      const _component_el_table = resolveComponent("el-table");
+      const _component_el_button = resolveComponent("el-button");
+      const _component_el_dialog = resolveComponent("el-dialog");
+      return openBlock(), createElementBlock(Fragment, null, [
+        createVNode(_component_el_input, {
+          modelValue: inputValue.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
+          placeholder: "请选择",
+          onClick: inputClick
+        }, {
+          suffix: withCtx(() => [
+            createVNode(_component_el_icon, { onClick: inputClick }, {
+              default: withCtx(() => [
+                createVNode(unref(Search))
+              ]),
+              _: 1
+            })
+          ]),
+          _: 1
+        }, 8, ["modelValue"]),
+        createVNode(_component_el_dialog, {
+          modelValue: dialogVisible.value,
+          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
+          title: "Tips",
+          width: "500"
+        }, {
+          footer: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              createVNode(_component_el_button, {
+                onClick: _cache[1] || (_cache[1] = ($event) => dialogVisible.value = false)
+              }, {
+                default: withCtx(() => [
+                  createTextVNode("取消")
+                ]),
+                _: 1
+              }),
+              createVNode(_component_el_button, {
+                type: "primary",
+                onClick: confirm
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(" 确定 ")
+                ]),
+                _: 1
+              })
+            ])
+          ]),
+          default: withCtx(() => [
+            createVNode(_component_el_table, {
+              data: tableData,
+              style: { "width": "100%" },
+              onSelectionChange: handleSelectionChange
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_table_column, {
+                  type: "selection",
+                  width: "55"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "date",
+                  label: "Date",
+                  width: "180"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "name",
+                  label: "Name",
+                  width: "180"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "address",
+                  label: "Address"
+                })
+              ]),
+              _: 1
+            })
+          ]),
+          _: 1
+        }, 8, ["modelValue"])
+      ], 64);
+    };
+  }
+});
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue2.js

@@ -1,155 +1,4 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, unref, createElementVNode, createTextVNode } from "vue";
-import { Search } from "@element-plus/icons-vue";
-const _hoisted_1 = { class: "dialog-footer" };
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "dataorigin-input-table",
-  props: {
-    modelValue: {
-      type: String,
-      default: ""
-    }
-  },
-  emits: ["update:modelValue"],
-  setup(__props, { emit: __emit }) {
-    const props = __props;
-    const inputValue = ref(props.modelValue);
-    const emit = __emit;
-    const tableData = [
-      {
-        id: 1,
-        date: "2016-05-03",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 2,
-        date: "2016-05-02",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 3,
-        date: "2016-05-04",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 4,
-        date: "2016-05-01",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      }
-    ];
-    const dialogVisible = ref(false);
-    const selectData = ref([]);
-    watch(() => props.modelValue, (newVal) => {
-      inputValue.value = newVal;
-    });
-    function confirm() {
-      if (selectData.value.length > 0) {
-        let str = "";
-        selectData.value.forEach((item) => {
-          str = str + item.name + ",";
-        });
-        str = str.substring(0, str.length - 1);
-        emit("update:modelValue", str);
-        dialogVisible.value = false;
-      } else {
-        dialogVisible.value = false;
-      }
-    }
-    function handleSelectionChange(selection) {
-      selectData.value = selection;
-    }
-    function inputClick() {
-      dialogVisible.value = true;
-    }
-    return (_ctx, _cache) => {
-      const _component_el_icon = resolveComponent("el-icon");
-      const _component_el_input = resolveComponent("el-input");
-      const _component_el_table_column = resolveComponent("el-table-column");
-      const _component_el_table = resolveComponent("el-table");
-      const _component_el_button = resolveComponent("el-button");
-      const _component_el_dialog = resolveComponent("el-dialog");
-      return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(_component_el_input, {
-          modelValue: inputValue.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
-          placeholder: "请选择",
-          onClick: inputClick
-        }, {
-          suffix: withCtx(() => [
-            createVNode(_component_el_icon, { onClick: inputClick }, {
-              default: withCtx(() => [
-                createVNode(unref(Search))
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["modelValue"]),
-        createVNode(_component_el_dialog, {
-          modelValue: dialogVisible.value,
-          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
-          title: "Tips",
-          width: "500"
-        }, {
-          footer: withCtx(() => [
-            createElementVNode("div", _hoisted_1, [
-              createVNode(_component_el_button, {
-                onClick: _cache[1] || (_cache[1] = ($event) => dialogVisible.value = false)
-              }, {
-                default: withCtx(() => [
-                  createTextVNode("取消")
-                ]),
-                _: 1
-              }),
-              createVNode(_component_el_button, {
-                type: "primary",
-                onClick: confirm
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(" 确定 ")
-                ]),
-                _: 1
-              })
-            ])
-          ]),
-          default: withCtx(() => [
-            createVNode(_component_el_table, {
-              data: tableData,
-              style: { "width": "100%" },
-              onSelectionChange: handleSelectionChange
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_el_table_column, {
-                  type: "selection",
-                  width: "55"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "date",
-                  label: "Date",
-                  width: "180"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "name",
-                  label: "Name",
-                  width: "180"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "address",
-                  label: "Address"
-                })
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["modelValue"])
-      ], 64);
-    };
-  }
-});
+import _sfc_main from "./dataorigin-input-table.vue.js";
 export {
   _sfc_main as default
 };

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

@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (!((_b = (_a = props.pageDesign) == null ? void 0 : _a.tableUuids) == null ? void 0 : _b.includes(props.configure.uuid))) {
             (_d = (_c = props.pageDesign) == null ? void 0 : _c.tableUuids) == null ? void 0 : _d.push(props.configure.uuid);
           }
-          if (!((_e = props.pageDesign) == null ? void 0 : _e.listCodesMap)) {
+          if ((_e = props.pageDesign) == null ? void 0 : _e.listCodesMap) {
             const listCode = getListCode(props.pageDesign.code, props.pageDesign.version, props.configure.uuid);
             props.pageDesign.listCodesMap[listCode] = props.configure.code;
           }
@@ -66,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             (_d = (_c = props.pageDesign) == null ? void 0 : _c.tableUuids) == null ? void 0 : _d.shift(uuidIndex, 1);
           }
           const listCode = getListCode(props.pageDesign.code, props.pageDesign.version, props.configure.uuid);
-          if (props.pageDesign.listCodesMap[listCode]) {
+          if (props.pageDesign.listCodesMap && props.pageDesign.listCodesMap[listCode]) {
             delete props.pageDesign.listCodesMap[listCode];
           }
         });

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

@@ -1 +1,7 @@
-
+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,7 +1 @@
-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,6 +1,6 @@
 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.vue2.js";
+import config from "./config.vue.js";
 import { standardButtonOperations } from "../../../utils/assemblys-config.js";
 import { findDesignItemByUuid, getUuidv4, deepCopy } from "../../../utils/common-util.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";

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

@@ -15,7 +15,7 @@ import "@codemirror/state";
 import "@codemirror/autocomplete";
 import "@codemirror/language";
 import "@codemirror/search";
-import "../page-event/config.vue.js";
+import "../page-event/config.vue2.js";
 import "../../../utils/assemblys-config.js";
 import "../../../../../stores/page-store.js";
 import "../../../../../stores/event-undo-redo-store.js";

package/dist/es/style.css

@@ -1294,6 +1294,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-select__wrapper.is-disabled{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -1913,6 +1917,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -3770,14 +3778,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
-		cursor: default;
-}
-
-.el-select__wrapper.is-disabled{
-		cursor: default;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -16870,13 +16870,26 @@ fieldset.amb-design-item-selected {
   padding-bottom: 5px;
 }
 
+[data-v-7fcec2fa] .el-cascader-menu {
+  min-width: 120px !important;
+}
+
 .seleteSort[data-v-e6c84ad9] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
 
-[data-v-7fcec2fa] .el-cascader-menu {
-  min-width: 120px !important;
+.editorTool[data-v-26f79956] {
+  margin-left: auto;
+}
+.editorOption[data-v-26f79956] {
+  margin-right: 10px;
+  cursor: pointer;
+}
+.pppp[data-v-26f79956] {
+  display: flex; /* 使用Flex布局 */
+  justify-content: flex-start;
+  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
 }
 
 .icon-set-center-body[data-v-4aa5ce08]{
@@ -16916,25 +16929,8 @@ fieldset.amb-design-item-selected {
 	margin-bottom: 20px;
 }
 
-.editorTool[data-v-26f79956] {
-  margin-left: auto;
-}
-.editorOption[data-v-26f79956] {
-  margin-right: 10px;
-  cursor: pointer;
-}
-.pppp[data-v-26f79956] {
-  display: flex; /* 使用Flex布局 */
-  justify-content: flex-start;
-  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
-}
-
-.seleteSort[data-v-97438be5] {
-	border-radius: 5px;
-	border: 1px solid rgba(88, 147, 239);
-}
-[data-v-97438be5] .el-select__selection{
-	display: inline-block;
+.el-tag[data-v-665d3bf4]{
+	margin-left: 10px;
 }
 
 .row-backgroud-header-tittle[data-v-b203475d]{
@@ -16996,8 +16992,12 @@ li[data-v-b436905c] {
   list-style-type: none;
 }
 
-.el-tag[data-v-665d3bf4]{
-	margin-left: 10px;
+.seleteSort[data-v-97438be5] {
+	border-radius: 5px;
+	border: 1px solid rgba(88, 147, 239);
+}
+[data-v-97438be5] .el-select__selection{
+	display: inline-block;
 }
 
 .input-with-select .el-input-group__append {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.0.96",
+  "version": "2.0.99",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -39,7 +39,7 @@
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
     "service-flow-designer": "2.0.94",
-    "super-page-runtime": "2.0.95",
+    "super-page-runtime": "2.0.97",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",