super-page-designer 2.0.51 → 2.0.54

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

@@ -1,7 +1,8 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, createCommentVNode, unref } from "vue";
 import _sfc_main$1 from "../../form/common/suffixmodule.vue.js";
-import IconSetDialog from "../../form/common/icon-set-dialog.vue.js";
 import { Search } from "@element-plus/icons-vue";
+import "../../form/common/icon-set-dialog.vue2.js";
+import _sfc_main$2 from "./formatting-icon-label.vue.js";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "formatting",
@@ -51,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         footer: withCtx(() => [
           createElementVNode("div", _hoisted_1, [
             createVNode(_component_el_button, {
-              onClick: _cache[21] || (_cache[21] = ($event) => _ctx.$emit("close"))
+              onClick: _cache[18] || (_cache[18] = ($event) => _ctx.$emit("close"))
             }, {
               default: withCtx(() => [
                 createTextVNode("取消")
@@ -72,7 +73,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_form, {
             modelValue: formData.value,
-            "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => formData.value = $event),
+            "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => formData.value = $event),
             "label-width": "140px"
           }, {
             default: withCtx(() => [
@@ -357,107 +358,68 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 key: 9,
                 suffixModule: formData.value.suffixModule
               }, null, 8, ["suffixModule"])) : createCommentVNode("", true),
-              formData.value.type === "icon" ? (openBlock(), createBlock(_component_el_form_item, {
+              formData.value.type === "icon" ? (openBlock(), createBlock(_sfc_main$2, {
                 key: 10,
-                label: "图标",
-                class: "amb-design-attr-item"
-              }, {
-                default: withCtx(() => [
-                  createVNode(IconSetDialog, {
-                    modelValue: formData.value.icon,
-                    "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => formData.value.icon = $event)
-                  }, null, 8, ["modelValue"])
-                ]),
-                _: 1
-              })) : createCommentVNode("", true),
-              formData.value.type === "icon" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 11,
-                label: "图标位置",
-                class: "amb-design-attr-item"
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_el_switch, {
-                    modelValue: formData.value.position,
-                    "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => formData.value.position = $event),
-                    "active-text": "后缀",
-                    "inactive-text": "前缀",
-                    "active-value": "suf",
-                    "inactive-value": "pre"
-                  }, null, 8, ["modelValue"])
-                ]),
-                _: 1
-              })) : createCommentVNode("", true),
-              formData.value.type === "icon" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 12,
-                label: "回调事件",
-                class: "amb-design-attr-item"
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_el_input, {
-                    modelValue: formData.value.event,
-                    "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => formData.value.event = $event)
-                  }, null, 8, ["modelValue"])
-                ]),
-                _: 1
-              })) : createCommentVNode("", true),
+                setting: formData.value
+              }, null, 8, ["setting"])) : createCommentVNode("", true),
               formData.value.type === "custom" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 13,
+                key: 11,
                 label: "自定义方法",
                 class: "amb-design-attr-item"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_input, {
                     modelValue: formData.value.customControl,
-                    "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => formData.value.customControl = $event)
+                    "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => formData.value.customControl = $event)
                   }, null, 8, ["modelValue"])
                 ]),
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 14,
+                key: 12,
                 label: "是否多选"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_switch, {
                     modelValue: formData.value.multiple,
-                    "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => formData.value.multiple = $event)
+                    "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => formData.value.multiple = $event)
                   }, null, 8, ["modelValue"])
                 ]),
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 15,
+                key: 13,
                 label: "接受上传的文件类型"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_input, {
                     modelValue: formData.value.accept,
-                    "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => formData.value.accept = $event)
+                    "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => formData.value.accept = $event)
                   }, null, 8, ["modelValue"])
                 ]),
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 16,
+                key: 14,
                 label: "文件限制大小(M)"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_input_number, {
                     modelValue: formData.value.limitFileSize,
-                    "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => formData.value.limitFileSize = $event),
+                    "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => formData.value.limitFileSize = $event),
                     min: 1
                   }, null, 8, ["modelValue"])
                 ]),
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" && formData.value.multiple ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 17,
+                key: 15,
                 label: "选择数据表"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_input, {
                     modelValue: formData.value.childAnnexDataTableCode,
-                    "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => formData.value.childAnnexDataTableCode = $event),
+                    "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => formData.value.childAnnexDataTableCode = $event),
                     onClick: openSelectDataTable,
                     clearable: ""
                   }, {
@@ -473,13 +435,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 18,
+                key: 16,
                 label: "展示名称对应字段"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_select, {
                     modelValue: formData.value.showName,
-                    "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => formData.value.showName = $event),
+                    "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => formData.value.showName = $event),
                     filterable: ""
                   }, {
                     default: withCtx(() => [
@@ -494,13 +456,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 _: 1
               })) : createCommentVNode("", true),
               formData.value.type === "files" ? (openBlock(), createBlock(_component_el_form_item, {
-                key: 19,
+                key: 17,
                 label: "服务器名称对应字段"
               }, {
                 default: withCtx(() => [
                   createVNode(_component_el_select, {
                     modelValue: formData.value.serverName,
-                    "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => formData.value.serverName = $event),
+                    "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => formData.value.serverName = $event),
                     filterable: ""
                   }, {
                     default: withCtx(() => [

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode } from "vue";
 import "@element-plus/icons-vue";
-import "../../form/common/icon-set-dialog.vue3.js";
+import "../../form/common/icon-set-dialog.vue2.js";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "querySetting",

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

@@ -45,6 +45,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
+    console.log("%c描述-170030", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.pageDesign);
     function headerClick(item, column) {
       if (item.props.base) {
         setColumnData(item);
@@ -143,6 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_table_column = resolveComponent("el-table-column");
       return openBlock(), createBlock(_component_el_table_column, {
         fixed: false,
+        "column-key": __props.listColumns.uuid,
         width: __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.columnWidth ? __props.listColumns.props.base.columnWidth : 200,
         label: getTableHeaderName(__props.listColumns),
         align: __props.listColumns.props && __props.listColumns.props.base && __props.listColumns.props.base.alignContent ? __props.listColumns.props.base.alignContent : __props.designProperty.alignContent,
@@ -220,7 +222,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           key: "1"
         } : void 0
-      ]), 1032, ["width", "label", "align", "header-align"]);
+      ]), 1032, ["column-key", "width", "label", "align", "header-align"]);
     };
   }
 });

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

@@ -274,8 +274,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, {
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
-                          modelValue: __props.configure.props.dataOrigin.defaultExpandAll,
-                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.defaultExpandAll = $event),
+                          modelValue: __props.configure.props.dataOrigin.defaultExpand,
+                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.defaultExpand = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [

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

@@ -7,7 +7,8 @@ import "@element-plus/icons-vue";
 import "agilebuilder-ui/src/utils/request";
 import "uuid";
 import "../../../../../../stores/page-store.js";
-import "../../common/common-variable-bind.vue3.js";
+import "../../../../../../stores/table-store.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/table-attr.vue2.js

@@ -9,7 +9,6 @@ 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 eventBus from "../../../../utils/eventBus.js";
-import "../../../../utils/assemblys-config.js";
 const _hoisted_1 = {
   key: 0,
   class: "amb-design-attr-content"

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-130db8b6"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8cf7f2d0"]]);
 export {
   tableDesign as default
 };

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

@@ -116,7 +116,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     eventBus.$on("reloadTable", (tableData2) => {
-      props.configure.items = JSON.parse(JSON.stringify(tableData2));
+      props.configure.items = tableData2;
       listColumns.value = getColumnsWithGroupHeader(props.configure);
       if (tableRef.value) {
         tableRef.value.doLayout();
@@ -213,10 +213,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       columnData.value = item;
     }
     function headerDragend(newWidth, oldWidth, column, event) {
-      event.stopPropagation();
-      if (columnData.value.props && columnData.value.props.base) {
-        columnData.value.props.base.columnWidth = newWidth;
-      }
+      let data = getColumnsConfigure(listColumns.value, column.columnKey);
+      data.props.base.columnWidth = newWidth;
+    }
+    function getColumnsConfigure(columnData2, uuid) {
+      let dataObj = {};
+      columnData2.forEach((item) => {
+        if (item.uuid && item.uuid === uuid) {
+          console.log("%c描述-193228", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", item);
+          return dataObj = item;
+        }
+        if (item.children && item.children.length > 0) {
+          dataObj = getColumnsConfigure(item.children, uuid);
+        }
+      });
+      return dataObj;
     }
     function addClass({ row, column, rowIndex, columnIndex }) {
       let className = "";