super-page-designer 2.0.78 → 2.0.82

package/dist/es/components/design/views/assemblys/container/container/container-design.vue2.js

@@ -3,7 +3,8 @@ import { VueDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "container-design",
   props: {
@@ -112,25 +113,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else if (area == "header") {
         items = props.configure.headers;
       }
-      if (sourceItem.items && sourceItem.items.length > 0) {
-        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _deleteItem(items, sourceItem);
-        }).catch((err) => {
-          console.log(err);
-        });
-      } else {
-        _deleteItem(items, sourceItem);
-      }
-    }
-    function _deleteItem(parentItems, sourceItem) {
-      const index = parentItems.indexOf(sourceItem);
-      if (index > -1) {
-        parentItems.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       const _component_el_container = resolveComponent("el-container");

package/dist/es/components/design/views/assemblys/container/flex/flex-design.vue2.js

@@ -3,7 +3,8 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "flex-design",
   props: {
@@ -107,26 +108,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       items.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) {
       let items = props.configure.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       const _component_el_row = resolveComponent("el-row");

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

@@ -3,7 +3,8 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _hoisted_1 = { class: "amb-design-item-default" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "form-design",
@@ -99,26 +100,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.items.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 items = props.configure.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       const _component_el_form = resolveComponent("el-form");

package/dist/es/components/design/views/assemblys/container/tabs/tabs-design.vue2.js

@@ -1,10 +1,11 @@
 import { defineComponent, ref, watch, openBlock, createBlock, unref, normalizeClass, normalizeStyle, withCtx, createElementBlock, Fragment, renderList, createCommentVNode, createElementVNode, toDisplayString, createVNode, reactive } from "vue";
-import { ElTabs, ElTabPane, ElMessageBox } from "element-plus";
+import { ElTabs, ElTabPane } from "element-plus";
 import { SuperIcon } from "agilebuilder-ui";
 import { VueDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "tabs-design",
   props: {
@@ -72,25 +73,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function deleteItem(parentItem, sourceItem) {
-      if (sourceItem.items && sourceItem.items.length > 0) {
-        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
-          confirmButtonText: "确认",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          _deleteItem(parentItem, sourceItem);
-        }).catch((err) => {
-          console.log(err);
-        });
-      } else {
-        _deleteItem(parentItem, sourceItem);
-      }
-    }
-    function _deleteItem(parentItem, sourceItem) {
-      const index = parentItem.items.indexOf(sourceItem);
-      if (index > -1) {
-        parentItem.items.splice(index, 1);
-      }
+      const items = parentItem.items;
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElTabs), {

package/dist/es/components/design/views/assemblys/container/tools/tools-design.vue2.js

@@ -3,7 +3,8 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
-import { ElMessageBox } from "element-plus";
+import "element-plus";
+import { deleteDesignItem } from "../../../../utils/page-design-util.js";
 const _hoisted_1 = {
   class: "amb-widget-tools-parent amb-design-item-default",
   style: { "width": "99.5%" }
@@ -128,26 +129,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       items.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) {
       let items = props.configure.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
-      }
+      deleteDesignItem(items, sourceItem, sourceItem.items && sourceItem.items.length > 0, true);
     }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [

package/dist/es/components/design/views/assemblys/data/component/column-config.vue.js

@@ -98,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         modelFieldsMap[attrbt.dbColumnName] = attrbt;
         if (attrbt.dbColumnName === "MODIFIER_NAME" || attrbt.dbColumnName === "MODIFIED_TIME" || attrbt.dbColumnName === "modifier_name" || attrbt.dbColumnName === "modified_time") {
           baseFieldArr.push(attrbt);
-        } else if (!attrbt.edit && attrbt.dbColumnName !== "operation") {
+        } else if (!attrbt.edit && attrbt.dbColumnName !== "operation" && attrbt.generateList) {
           attrbt.displayOrder = displayOrderStart++;
           fieldArr.push(getTableColumnConf(attrbt));
         }

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

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

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

@@ -13,7 +13,6 @@ import StateButton from "../../common/state-button.vue.js";
 import _sfc_main$3 from "../../form/common/data-origin-service-in.vue.js";
 import _sfc_main$2 from "../../common/page-permission-select.vue.js";
 import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
-import "../../../../utils/assemblys-config.js";
 import { ElLoading } from "element-plus";
 import { tableField } from "../../../../../../stores/table-store.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -112,7 +111,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         tableInfo.value = null;
         modelFields.value = [];
       }
-      eventBus.$emit("reloadTable", columns);
+      eventBus.$emit("reloadTable-" + props.configure.uuid, columns);
       loading.close();
     }
     function selectTable() {

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

@@ -198,7 +198,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         !scope.row.editing ? (openBlock(), createElementBlock("span", _hoisted_1, [
                           createElementVNode("span", null, toDisplayString(scope.row.columnName), 1)
                         ])) : (openBlock(), createElementBlock("span", _hoisted_2, [
-                          !scope.row.columnName || __props.configure.props.dataOrigin.optionValueSetType === "dataTable" ? (openBlock(), createBlock(_component_el_select, {
+                          __props.configure.props.dynamicColumnData.dataSources == "dataTable" ? (openBlock(), createBlock(_component_el_select, {
                             key: 0,
                             modelValue: scope.row.columnName,
                             "onUpdate:modelValue": ($event) => scope.row.columnName = $event,
@@ -217,13 +217,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               }), 128))
                             ]),
                             _: 2
-                          }, 1032, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("", true),
-                          __props.configure.props.dataOrigin.optionValueSetType === "sql" ? (openBlock(), createBlock(_component_el_input, {
+                          }, 1032, ["modelValue", "onUpdate:modelValue"])) : __props.configure.props.dynamicColumnData.dataSources == "sql" ? (openBlock(), createBlock(_component_el_input, {
                             key: 1,
                             modelValue: scope.row.columnName,
                             "onUpdate:modelValue": ($event) => scope.row.columnName = $event
-                          }, null, 8, ["modelValue", "onUpdate:modelValue"])) : createCommentVNode("", true),
-                          __props.configure.props.dataOrigin.optionValueSetType === "optionGroup" ? (openBlock(), createBlock(_component_el_select, {
+                          }, null, 8, ["modelValue", "onUpdate:modelValue"])) : __props.configure.props.dynamicColumnData.dataSources == "optionGroup" ? (openBlock(), createBlock(_component_el_select, {
                             key: 2,
                             modelValue: scope.row.columnName,
                             "onUpdate:modelValue": ($event) => scope.row.columnName = $event,

package/dist/es/components/design/views/assemblys/data/table/table-attr.vue2.js

@@ -1,13 +1,13 @@
 import { defineComponent, ref, openBlock, createElementBlock, createVNode, unref, isRef, createElementVNode, withDirectives, createBlock, vShow } from "vue";
-import _sfc_main$5 from "./table-attr-base.vue.js";
-import _sfc_main$6 from "./table-attr-advanced.vue.js";
-import _sfc_main$7 from "./table-attr-style.vue.js";
-import _sfc_main$4 from "../component/attr-header.vue.js";
-import _sfc_main$8 from "./table-attr-event.vue.js";
+import _sfc_main$4 from "./table-attr-base.vue.js";
+import _sfc_main$5 from "./table-attr-advanced.vue.js";
+import _sfc_main$6 from "./table-attr-style.vue.js";
+import _sfc_main$3 from "../component/attr-header.vue.js";
+import _sfc_main$7 from "./table-attr-event.vue.js";
 import AttrHeader from "../../form/common/attr-header.vue.js";
-import _sfc_main$1 from "./tablecolumn-attr-base.vue.js";
-import _sfc_main$2 from "./tablecolumn-attr-style.vue.js";
-import _sfc_main$3 from "./tablecolumn-attr-event.vue.js";
+import TablecolumnAttrBase from "./tablecolumn-attr-base.vue.js";
+import _sfc_main$1 from "./tablecolumn-attr-style.vue.js";
+import _sfc_main$2 from "./tablecolumn-attr-event.vue.js";
 import eventBus from "../../../../utils/eventBus.js";
 const _hoisted_1 = {
   key: 0,
@@ -50,7 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           showEvent: ""
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_2, [
-          withDirectives((openBlock(), createBlock(_sfc_main$1, {
+          withDirectives((openBlock(), createBlock(TablecolumnAttrBase, {
             key: columnData.value.uuid,
             pageDesign: __props.pageDesign,
             configure: columnData.value,
@@ -58,36 +58,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["pageDesign", "configure", "tableConfigure"])), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
-          withDirectives(createVNode(_sfc_main$2, { configure: columnData.value }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$1, { configure: columnData.value }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "style"]
           ]),
-          withDirectives(createVNode(_sfc_main$3, { configure: columnData.value }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$2, { configure: columnData.value }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "event"]
           ])
         ])
       ])) : (openBlock(), createElementBlock("div", _hoisted_3, [
-        createVNode(_sfc_main$4, {
+        createVNode(_sfc_main$3, {
           modelValue: unref(currentConfigType),
           "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
         }, null, 8, ["modelValue"]),
         createElementVNode("div", _hoisted_4, [
-          withDirectives(createVNode(_sfc_main$5, {
+          withDirectives(createVNode(_sfc_main$4, {
             pageDesign: __props.pageDesign,
             configure: __props.configure
           }, null, 8, ["pageDesign", "configure"]), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
-          withDirectives(createVNode(_sfc_main$6, {
+          withDirectives(createVNode(_sfc_main$5, {
             pageDesign: __props.pageDesign,
             configure: __props.configure,
             tableConfigure: tableConfigure.value
           }, null, 8, ["pageDesign", "configure", "tableConfigure"]), [
             [vShow, unref(currentConfigType) === "advanced"]
           ]),
-          withDirectives(createVNode(_sfc_main$7, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$6, { configure: __props.configure }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "style"]
           ]),
-          withDirectives(createVNode(_sfc_main$8, { configure: __props.configure }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$7, { configure: __props.configure }, null, 8, ["configure"]), [
             [vShow, unref(currentConfigType) === "event"]
           ])
         ])

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

@@ -2,7 +2,7 @@ import _sfc_main from "./table-design.vue2.js";
 import "./table-design.vue3.js";
 import "./table-design.vue4.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fdf0b268"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f6500856"]]);
 export {
   tableDesign as default
 };

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

@@ -115,9 +115,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     );
-    eventBus.$on("reloadTable", (tableData2) => {
-      props.configure.items = tableData2;
-      listColumns.value = getColumnsWithGroupHeader(props.configure);
+    eventBus.$on("reloadTable-" + props.configure.uuid, (columns) => {
+      if (columns) {
+        props.configure.items = columns;
+        listColumns.value = getColumnsWithGroupHeader(props.configure);
+      }
       if (tableRef.value) {
         tableRef.value.doLayout();
       }