super-page-designer 2.0.20 → 2.0.26

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, renderSlot } from "vue";
+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.vue.js";
 import { Codemirror } from "vue-codemirror";
 import _sfc_main$6 from "../../workflow/component/combination.vue.js";
@@ -6,8 +6,8 @@ import _sfc_main$5 from "./return-set-table.vue.js";
 import _sfc_main$7 from "./column-config.vue.js";
 import _sfc_main$4 from "../../common/common-select-table.vue.js";
 import { Search, Close } from "@element-plus/icons";
-import { queryTableFieldsOrMap } from "../../../../utils/page-table-util.js";
-import "uuid";
+import { queryTableFields } from "../../../../utils/page-table-util.js";
+import { getUuidv4 } from "../../../../utils/common-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import StateButton from "../../common/state-button.vue.js";
 import _sfc_main$3 from "../../form/common/data-origin-service-in.vue.js";
@@ -66,6 +66,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const atPresentSortIndex = ref("");
     const defaultQueryVisible = ref(false);
     const dataOriginInfo = props.configure.props.dataOrigin;
+    const serviceFields = ref([]);
+    const showFields = computed(() => {
+      return serviceFields.value.filter((item) => {
+        return item.type == "array" || item.type == "any" || !item.type;
+      });
+    });
     if (!dataOriginInfo.service) {
       dataOriginInfo.service = {};
     }
@@ -74,7 +80,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function saveCondition(table) {
       props.configure.props.dataOrigin["sqlFilterCondition"] = JSON.stringify(table);
-      console.log("%c描述-142553", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dataOrigin["sqlFilterCondition"]);
     }
     function closeDefaultQuery() {
       defaultQueryVisible.value = false;
@@ -113,30 +118,124 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         props.configure.props.dataOrigin.alias = tableInfo.alias;
         const systemCode = tableInfo.systemCode ? tableInfo.systemCode : props.pageDesign.systemCode;
         const systemVersion = tableInfo.systemVersion ? tableInfo.systemVersion : props.pageDesign.version;
-        queryTableFieldsOrMap(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
-          props.configure.modelFields = tableFields.attributeArr;
-          props.configure.modelFieldsMap = tableFields.fieldMap;
-          console.log("queryTableFields", tableFields);
+        queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
+          props.configure.modelFields = tableFields;
+          props.configure.modelFieldsMap = transformMap(tableFields);
+          tableFields.forEach((attrbt) => {
+            let fieldObj = getTableField(attrbt);
+            if (props.configure.props.base.showOperation) {
+              props.configure.items.splice(props.configure.items.length - 1, 0, fieldObj);
+            } else {
+              props.configure.items.push(fieldObj);
+            }
+          });
         });
       }
     }
+    function transformMap(tableFields) {
+      let obj = {};
+      tableFields.forEach((item) => {
+        obj[item.name] = item;
+      });
+      return obj;
+    }
+    function getTableField(fieldInfo) {
+      let obj = {
+        uuid: getUuidv4(),
+        name: "",
+        dataType: fieldInfo.dataType,
+        props: {
+          base: {
+            prop: fieldInfo.name,
+            name: fieldInfo.alias,
+            visible: true,
+            tittleShow: false,
+            displayOrder: fieldInfo.displayOrder,
+            sortable: true
+          },
+          size: {},
+          editLine: {},
+          scan: {},
+          preSuffix: {},
+          verification: {},
+          dataOrigin: {
+            sortField: [{ name: "", type: "" }],
+            staticState: [{ label: "选项1", vaule: 1 }],
+            displayQuantity: 20
+          },
+          defaultValue: {},
+          inParameter: {},
+          title: {},
+          definition: {},
+          uploadConfig: {},
+          singleWidth: {},
+          suffixModule: {},
+          querySetting: {},
+          orgFields: [{ type: "", model: "" }],
+          format: `{"type":"","icon":"111","suffixModule":{"staticStates":[]},"jumpPageAdditional":{"staticStates":[]}}`
+        },
+        events: [
+          { name: "show", label: "列表显示", tip: "列表显示回调方法" },
+          { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
+        ],
+        style: {
+          titleFont: {},
+          contentFont: {},
+          width: {},
+          background: {},
+          tableCell: [{ value: "", label: "" }],
+          conentPadding: {},
+          tittlePadding: {},
+          border: {},
+          shadow: {},
+          tittleClass: ""
+        }
+      };
+      return obj;
+    }
     function afterSelectService(type, code, name, serviceId) {
+      dataOriginInfo.service.id;
       dataOriginInfo.service.simpleCode = code;
-      dataOriginInfo.service.name = name;
       dataOriginInfo.service.id = serviceId;
+      dataOriginInfo.service.name = name;
       getServiceReturnFields();
     }
+    let hisQueryId = null;
     function getServiceReturnFields() {
       const serviceId = dataOriginInfo.service.id;
+      if (hisQueryId == serviceId) {
+        return;
+      }
+      hisQueryId = serviceId;
       if (!serviceId) {
         props.configure.serviceFields = [];
+        serviceFields.value = [];
         props.configure.serviceDataField = null;
         return;
       }
       queryServiceReturnFields(serviceId).then((fields) => {
         props.configure.serviceFields = fields;
+        serviceFields.value = fields;
+        checkDataFieldExist();
       });
     }
+    function checkDataFieldExist() {
+      if (!props.configure.serviceDataField) {
+        return;
+      }
+      let isExist = false;
+      if (serviceFields.value) {
+        for (let o of serviceFields.value) {
+          if (o.value == props.configure.serviceDataField) {
+            isExist = true;
+            break;
+          }
+        }
+      }
+      if (!isExist) {
+        props.configure.serviceDataField = null;
+      }
+    }
     function saveReturnSet(tableData) {
       console.log("%c描述-155222", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", tableData);
       props.configure.props.dataOrigin.returnSetList = tableData;
@@ -480,7 +579,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(showFields.value, (field, index) => {
                       return openBlock(), createBlock(_component_el_option, {
                         key: index,
                         label: field.label,
@@ -513,7 +612,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(showFields.value, (field, index) => {
                       return openBlock(), createBlock(_component_el_option, {
                         key: index,
                         label: field.label,
@@ -546,7 +645,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(showFields.value, (field, index) => {
                       return openBlock(), createBlock(_component_el_option, {
                         key: index,
                         label: field.label,
@@ -579,7 +678,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(showFields.value, (field, index) => {
                       return openBlock(), createBlock(_component_el_option, {
                         key: index,
                         label: field.label,

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

@@ -1,10 +1,5 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode } from "vue";
-import "@element-plus/icons";
 import "@element-plus/icons-vue";
-import "uuid";
-import "agilebuilder-ui/src/utils/request";
-import "../../../../../../stores/page-store.js";
-import "../../common/common-variable-bind.vue3.js";
 import "../../form/common/icon-set-dialog.vue3.js";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

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

@@ -4,7 +4,7 @@ import { VueDraggable } from "vue-draggable-plus";
 import eventBus from "../../../../utils/eventBus.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import _sfc_main$1 from "../../object-design.vue.js";
-import { ElMessage } from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 const _hoisted_1 = ["onClick", "onMouseout", "onMouseover"];
 const _hoisted_2 = { key: 2 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -103,14 +103,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function deleteItem(sourceItem) {
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
-      }
-      const items = props.configure.btnList;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
+        ElMessageBox.confirm(
+          "还有子元素，确定要删除吗?",
+          "删除",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        ).then(() => {
+          const items = props.configure.btnList;
+          const index = items.indexOf(sourceItem);
+          if (index > -1) {
+            items.splice(index, 1);
+          }
+        }).catch((err) => {
+          console.log(err);
+        });
       }
     }
     return (_ctx, _cache) => {

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

@@ -52,7 +52,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       matchBrackets: true
       // 括号匹配高亮
     };
-    const openCollapseItems = ref([]);
+    const openCollapseItems = ref(["compositeHeader", "amalgamated", "unfoldConent", "treeTable", "deleteLogic", "importSetting", "initialConfig", "otherSettings"]);
     ref([]);
     const sublist = ref([]);
     const selectTableDialog = ref(null);

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

@@ -1,12 +1,13 @@
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import DataOrigin from "../component/data-origin.vue.js";
-import _sfc_main$2 from "../../common/common-attr-size.vue.js";
-import _sfc_main$1 from "../../form/common/data-linkage.vue.js";
+import _sfc_main$3 from "../../common/common-attr-size.vue.js";
+import _sfc_main$2 from "../../form/common/data-linkage.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import "../../../../utils/eventBus.js";
 import "agilebuilder-ui/src/utils/request";
+import _sfc_main$1 from "../../common/common-function-code.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_3 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -27,7 +28,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const openCollapseItems = ref([]);
+    const openCollapseItems = ref(["base", "appearance", "querySetting", "editSetting", "columnSetting", "paging", "dataOrigin", "linkage", "attrSize"]);
     watch(() => props.configure.props.base.selection, (newVal) => {
       if (newVal) {
         let selectColumn = {
@@ -291,11 +292,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
-                        createVNode(BindVariable, {
+                        (openBlock(), createBlock(BindVariable, {
+                          key: __props.configure.uuid,
                           modelValue: __props.configure.props.base.prop,
                           paramTypes: ["data", "page"],
                           "onUpdate:modelValue": afterBindVariable
-                        }, null, 8, ["modelValue"])
+                        }, null, 8, ["modelValue"]))
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_form_item, {
+                      label: "绑定权限",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(), createBlock(_sfc_main$1, {
+                          key: __props.configure.uuid,
+                          configure: __props.configure
+                        }, null, 8, ["configure"]))
+                      ]),
+                      _: 1
+                    }),
+                    createVNode(_component_el_form_item, {
+                      label: "绑定权限",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"])
                       ]),
                       _: 1
                     }),
@@ -360,7 +383,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         placeholder: "Select"
                       }, {
                         default: withCtx(() => [
-                          (openBlock(true), createElementBlock(Fragment, null, renderList(scope.row.modelFields, (Ttime, index) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList(__props.configure.modelFields, (Ttime, index) => {
                             return openBlock(), createBlock(_component_el_option, {
                               key: index,
                               label: Ttime.alias,
@@ -1198,10 +1221,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_sfc_main$1, {
+              createVNode(_sfc_main$2, {
                 configureProps: __props.configure.props
               }, null, 8, ["configureProps"]),
-              createVNode(_sfc_main$2, {
+              createVNode(_sfc_main$3, {
                 size: __props.configure.props.size,
                 showMaxHeight: true
               }, null, 8, ["size"])

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createElementBlock, createVNode, unref, isRef, createElementVNode, withDirectives, vShow } from "vue";
+import { defineComponent, ref, openBlock, createElementBlock, createVNode, unref, isRef, createElementVNode, withDirectives, createBlock, vShow } from "vue";
 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";
@@ -37,30 +37,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     let currentConfigType = ref("base");
-    const ColumnData = ref({});
+    const columnData = ref({});
     const tableConfigure = ref({});
     eventBus.$on("selectColumn", (val) => {
-      ColumnData.value = val.columnData;
+      columnData.value = val.columnData;
       tableConfigure.value = val.tableConfigure;
     });
     return (_ctx, _cache) => {
-      return Object.keys(ColumnData.value).length > 0 && !_ctx.formModu ? (openBlock(), createElementBlock("div", _hoisted_1, [
+      return Object.keys(columnData.value).length > 0 && !_ctx.formModu ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(AttrHeader, {
           modelValue: unref(currentConfigType),
           "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, {
+          withDirectives((openBlock(), createBlock(_sfc_main$1, {
+            key: columnData.value.uuid,
             pageDesign: __props.pageDesign,
-            configure: ColumnData.value,
+            configure: columnData.value,
             tableConfigure: tableConfigure.value
-          }, null, 8, ["pageDesign", "configure", "tableConfigure"]), [
+          }, null, 8, ["pageDesign", "configure", "tableConfigure"])), [
             [vShow, unref(currentConfigType) === "base"]
           ]),
-          withDirectives(createVNode(_sfc_main$2, { configure: ColumnData.value }, null, 8, ["configure"]), [
+          withDirectives(createVNode(_sfc_main$2, { 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$3, { configure: columnData.value }, 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-7d20e187"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-2bfabc94"]]);
 export {
   tableDesign as default
 };

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

@@ -42,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designHeaderStyle = ref({});
     const designProperty = ref({});
     const menuVisible = ref(false);
-    const groupHeaders = props.configure.props.groupHeaders;
+    props.configure.props.groupHeaders;
     const listColumns = ref([]);
     const tableRef = ref(null);
     const hiddenColumsName = ref([]);
@@ -72,11 +72,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     onMounted(() => {
       listColumns.value = getColumnsWithGroupHeader(props.configure);
-      listColumns.value.forEach((item) => {
-        if (!item.props.base.visible) {
-          hiddenColumsName.value.push(item.props.base.name);
-        }
-      });
     });
     eventBus.$on("setHiddenColumsName", (data) => {
       if (!data.value) {
@@ -106,6 +101,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       listColumns.value = getColumnsWithGroupHeader(props.configure);
       tableRef.value.doLayout();
     });
+    watch(() => listColumns.value, (newVal) => {
+      newVal.forEach((item) => {
+        if (!item.props.base.visible) {
+          hiddenColumsName.value.push(item.props.base.name);
+        }
+      });
+    }, { deep: true });
     function onSelectWidget(selIndex, objConfigure) {
       emit("onSelectWidget", selIndex, objConfigure);
     }
@@ -181,7 +183,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             border: {},
             shadow: {},
             tittleClass: ""
-          }
+          },
+          events: [
+            { name: "setValueCallback", label: "弹框赋值回调", tip: "格式化配置超链接赋值回调" }
+          ]
         };
         props.configure.items.splice(columnDataIndex.value + 1, 0, newObj);
         if (props.configure.props.base.isEnableGroupHeader) {
@@ -194,7 +199,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           type: "warning"
         }).then(() => {
           console.log("%c描述-103732", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", columnData.value);
-          deleteGroupHeaderByColumnUuid(groupHeaders, columnData.value.uuid);
+          deleteGroupHeaderByColumnUuid(listColumns.value, columnData.value.uuid);
         }).catch(() => {
         });
       }