super-page-designer 2.0.41 → 2.0.45

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

@@ -7,12 +7,14 @@ 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 { queryTableFields } from "../../../../utils/page-table-util.js";
-import { getUuidv4 } from "../../../../utils/common-util.js";
+import "uuid";
 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";
 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";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = ["onClick"];
 const _hoisted_3 = { style: { "float": "left" } };
@@ -87,10 +89,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function saveDefaultQuery(table) {
       props.configure.props.dataOrigin["defaultQueryCriteria"] = table;
     }
-    function setConfigure(tableData) {
-      props.configure.items = tableData;
-      eventBus.$emit("reloadTable");
+    let modelFields = ref([]);
+    let isChangeTable = ref(false);
+    let tableInfo = ref(null);
+    function setConfigure({ columns, modelFieldsMap }) {
       columnConfigClose();
+      const loading = ElLoading.service({
+        lock: true,
+        text: "Loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      if (isChangeTable.value) {
+        debugger;
+        props.configure.tableSysCode = tableInfo ? tableInfo.value.systemCode : null;
+        props.configure.tableSysVersion = tableInfo ? tableInfo.value.systemVersion : null;
+        props.configure.props.dataOrigin.tableName = tableInfo ? tableInfo.value.name : null;
+        props.configure.props.dataOrigin.alias = tableInfo ? tableInfo.value.alias : null;
+        props.configure.modelFieldsMap = modelFieldsMap;
+        props.configure.modelFields = modelFields.value;
+        isChangeTable.value = false;
+        tableInfo.value = null;
+        modelFields.value = [];
+      }
+      eventBus.$emit("reloadTable", columns);
+      loading.close();
     }
     function selectTable() {
       selectTableDialog.value.openDialog();
@@ -100,98 +122,43 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.dataOrigin.alias = "";
       props.configure.modelFields = [];
     }
-    function onSelectTable(tableInfo) {
+    function onSelectTable(myTableInfo) {
       let hisKey = props.configure.tableSysCode ? props.configure.tableSysCode : "";
       hisKey += "_";
       hisKey += props.configure.tableSysVersion ? props.configure.tableSysVersion : "";
       hisKey += "_";
-      hisKey += props.configure.tableName ? props.configure.tableName : "";
-      let newKey = tableInfo.systemCode ? tableInfo.systemCode : "";
+      hisKey += props.configure.props.dataOrigin.tableName ? props.configure.props.dataOrigin.tableName : "";
+      let newKey = myTableInfo.systemCode ? myTableInfo.systemCode : "";
       newKey += "_";
-      newKey += tableInfo.systemVersion ? tableInfo.systemVersion : "";
+      newKey += myTableInfo.systemVersion ? myTableInfo.systemVersion : "";
       newKey += "_";
-      newKey += tableInfo.name ? tableInfo.name : "";
-      if (newKey != hisKey) {
-        props.configure.tableSysCode = tableInfo.systemCode;
-        props.configure.tableSysVersion = tableInfo.systemVersion;
-        props.configure.props.dataOrigin.tableName = tableInfo.name;
-        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;
-        queryTableFields(systemCode, systemVersion, tableInfo.name).then((tableFields) => {
-          props.configure.modelFields = [];
-          props.configure.modelFieldsMap = {};
-          props.configure.modelFields = tableFields;
-          let fieldArr = [];
-          tableFields.forEach((attrbt) => {
-            props.configure.modelFieldsMap[attrbt.dbColumnName] = attrbt;
-            if (!attrbt.edit || attrbt.alias == "修改人" || attrbt.alias == "修改时间") {
-              fieldArr.push(getTableField(attrbt));
-            }
-          });
-          if (props.configure.props.base.showOperation) {
-            props.configure.items.splice(props.configure.items.length - 1, 0, ...fieldArr);
-          } else {
-            props.configure.items.push(...fieldArr);
-          }
+      newKey += myTableInfo.name ? myTableInfo.name : "";
+      if (newKey !== hisKey) {
+        const loading = ElLoading.service({
+          lock: true,
+          text: "Loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        tableInfo.value = myTableInfo;
+        const systemCode = myTableInfo.systemCode ? myTableInfo.systemCode : props.pageDesign.systemCode;
+        const systemVersion = myTableInfo.systemVersion ? myTableInfo.systemVersion : props.pageDesign.version;
+        queryTableFields(systemCode, systemVersion, myTableInfo.name).then((tableFields) => {
+          isChangeTable.value = true;
+          modelFields.value = tableFields;
+          columnConfigVisible.value = true;
+          loading.close();
+          eventBus.$emit("reloadTable");
         });
       }
     }
-    function getTableField(fieldInfo) {
-      let obj = {
-        uuid: getUuidv4(),
-        isTable: true,
-        // 是否是表格组件
-        name: "",
-        edit: fieldInfo.edit,
-        dataType: fieldInfo.dataType,
-        props: {
-          base: {
-            prop: fieldInfo.name,
-            name: fieldInfo.alias,
-            visible: true,
-            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: "", 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 showColumnDialog() {
+      const systemCode = props.configure.tableSysCode ? props.configure.tableSysCode : props.pageDesign.systemCode;
+      const systemVersion = props.configure.tableSysVersion ? props.configure.tableSysVersion : props.pageDesign.version;
+      const tableName = props.configure.props.dataOrigin.tableName;
+      queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
+        modelFields.value = tableFields;
+        columnConfigVisible.value = true;
+      });
     }
     function afterSelectService(type, code, name, serviceId) {
       dataOriginInfo.service.id;
@@ -425,7 +392,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_button, {
                   type: "primary",
-                  onClick: _cache[7] || (_cache[7] = ($event) => columnConfigVisible.value = true)
+                  onClick: _cache[7] || (_cache[7] = ($event) => showColumnDialog())
                 }, {
                   default: withCtx(() => [
                     createTextVNode("编辑")
@@ -773,9 +740,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           columnConfigVisible.value ? (openBlock(), createBlock(_sfc_main$7, {
             key: 3,
             configure: __props.configure,
+            modelFields: unref(modelFields),
+            pageDesign: __props.pageDesign,
+            isChangeTable: unref(isChangeTable),
             onSetConfigure: setConfigure,
             onClose: columnConfigClose
-          }, null, 8, ["configure"])) : createCommentVNode("", true)
+          }, null, 8, ["configure", "modelFields", "pageDesign", "isChangeTable"])) : createCommentVNode("", true)
         ]),
         _: 3
       });