super-page-designer 2.0.96 → 2.0.98

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/table-attr-base.vue.js

@@ -8,7 +8,7 @@ import "agilebuilder-ui/src/utils/request";
 import "uuid";
 import "../../../../../../stores/page-store.js";
 import "../../../../../../stores/table-store.js";
-import "../../common/common-variable-bind.vue3.js";
+import "../../common/common-variable-bind.vue2.js";
 import "../../../../utils/eventBus.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };

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";
@@ -7,7 +7,7 @@ import "@element-plus/icons-vue";
 import http from "agilebuilder-ui/src/utils/request";
 import { usePageContextStore } from "../../../../../../stores/page-store.js";
 import "../../../../../../stores/table-store.js";
-import "../../common/common-variable-bind.vue3.js";
+import "../../common/common-variable-bind.vue2.js";
 import _sfc_main$4 from "./data-origin-service-in.vue.js";
 import { queryTableFields } from "../../../../utils/page-table-util.js";
 import { getCustomFuncs } from "../../../../utils/page-event-util.js";

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/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";