super-page-designer 2.0.26 → 2.0.34

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-340eb0cb"]]);
+const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-27cba854"]]);
 export {
   DataOrigin as default
 };

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

@@ -79,13 +79,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       atPresentSortIndex.value = index;
     }
     function saveCondition(table) {
-      props.configure.props.dataOrigin["sqlFilterCondition"] = JSON.stringify(table);
+      props.configure.props.dataOrigin["sqlFilterCondition"] = table;
     }
     function closeDefaultQuery() {
       defaultQueryVisible.value = false;
     }
     function saveDefaultQuery(table) {
-      props.configure.props.dataOrigin["defaultQueryCriteria"] = JSON.stringify(table);
+      props.configure.props.dataOrigin["defaultQueryCriteria"] = table;
     }
     function setConfigure(tableData) {
       props.configure.items = tableData;
@@ -119,37 +119,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         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;
-          props.configure.modelFieldsMap = transformMap(tableFields);
+          let fieldArr = [];
           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);
+            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);
+          }
         });
       }
     }
-    function transformMap(tableFields) {
-      let obj = {};
-      tableFields.forEach((item) => {
-        obj[item.name] = item;
-      });
-      return obj;
-    }
     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,
-            tittleShow: false,
             displayOrder: fieldInfo.displayOrder,
             sortable: true
           },
@@ -172,7 +172,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           suffixModule: {},
           querySetting: {},
           orgFields: [{ type: "", model: "" }],
-          format: `{"type":"","icon":"111","suffixModule":{"staticStates":[]},"jumpPageAdditional":{"staticStates":[]}}`
+          format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
         },
         events: [
           { name: "show", label: "列表显示", tip: "列表显示回调方法" },
@@ -245,7 +245,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       returnVisible.value = false;
     }
     function removeReturnSet(rowVal) {
-      props.configure.props.dataOrigin.returnSetList = props.configure.props.dataOrigin.returnSetList.filter((item) => item != rowVal);
+      props.configure.props.dataOrigin.returnSetList = props.configure.props.dataOrigin.returnSetList.filter(
+        (item) => item != rowVal
+      );
     }
     function columnConfigClose() {
       columnConfigVisible.value = false;
@@ -459,7 +461,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     key: index,
                     onClick: ($event) => seleteSort(index),
                     style: { "margin-top": "10px" },
-                    class: normalizeClass(atPresentSortIndex.value === index ? "amb-design-attr-item-inline seleteSort" : "amb-design-attr-item-inline")
+                    class: normalizeClass(
+                      atPresentSortIndex.value === index ? "amb-design-attr-item-inline seleteSort" : "amb-design-attr-item-inline"
+                    )
                   }, [
                     createVNode(_component_el_select, {
                       modelValue: item.name,
@@ -471,7 +475,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           return openBlock(), createBlock(_component_el_option, {
                             key: index2,
                             label: Ttime.alias,
-                            value: Ttime.name
+                            value: Ttime.dbColumnName
                           }, null, 8, ["label", "value"]);
                         }), 128))
                       ]),
@@ -563,7 +567,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 512), [
-              [vShow, __props.remote && (__props.configure.props.dataOrigin.optionValueSetType === "dataTable" || __props.configure.props.dataOrigin.optionValueSetType === "service")]
+              [
+                vShow,
+                __props.remote && (__props.configure.props.dataOrigin.optionValueSetType === "dataTable" || __props.configure.props.dataOrigin.optionValueSetType === "service")
+              ]
             ]),
             __props.configure.props.dataOrigin.optionValueSetType === "service" ? (openBlock(), createBlock(_component_el_form_item, {
               key: 4,
@@ -705,7 +712,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(StateButton, {
                   onClick: _cache[15] || (_cache[15] = ($event) => defaultQueryVisible.value = true),
-                  conditionData: JSON.parse(__props.configure.props.dataOrigin.defaultQueryCriteria)
+                  conditionData: __props.configure.props.dataOrigin.defaultQueryCriteria
                 }, null, 8, ["conditionData"])
               ]),
               _: 1
@@ -718,7 +725,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(StateButton, {
                   onClick: _cache[16] || (_cache[16] = ($event) => combinationVisible.value = true),
-                  conditionData: JSON.parse(__props.configure.props.dataOrigin.sqlFilterCondition)
+                  conditionData: __props.configure.props.dataOrigin.sqlFilterCondition
                 }, null, 8, ["conditionData"])
               ]),
               _: 1
@@ -749,20 +756,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["returnSetList"])) : createCommentVNode("", true),
           combinationVisible.value ? (openBlock(), createBlock(_sfc_main$6, {
             key: 1,
-            conditionList: __props.configure.props.dataOrigin.sqlFilterCondition,
+            list: __props.configure.props.dataOrigin.sqlFilterCondition,
             fieldNameList: __props.configure.modelFields,
             fieldMap: __props.configure.modelFieldsMap,
             onSave: saveCondition,
             onClose: closeCombination
-          }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
+          }, null, 8, ["list", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
           defaultQueryVisible.value ? (openBlock(), createBlock(_sfc_main$6, {
             key: 2,
-            conditionList: __props.configure.props.dataOrigin.defaultQueryCriteria,
+            list: __props.configure.props.dataOrigin.defaultQueryCriteria,
             fieldNameList: __props.configure.modelFields,
             fieldMap: __props.configure.modelFieldsMap,
             onClose: closeDefaultQuery,
             onSave: saveDefaultQuery
-          }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
+          }, null, 8, ["list", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
           columnConfigVisible.value ? (openBlock(), createBlock(_sfc_main$7, {
             key: 3,
             configure: __props.configure,

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

@@ -11,8 +11,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "table-children-column",
   props: {
     listColumns: {
-      type: Array,
-      default: () => []
+      type: Object,
+      default: () => {
+      }
     },
     selectWidget: {
       type: Object,

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

@@ -27,7 +27,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:prop", selectValue);
       if (props.propType != "") {
         props.tableConfigure.modelFields.forEach((item) => {
-          if (item.name === selectValue.value) {
+          if (item.dbColumnName === selectValue.value) {
             emit("update:propType", item.dataType);
             return;
           }
@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             return openBlock(), createBlock(_component_el_option, {
               key: index,
               label: item.alias,
-              value: item.name
+              value: item.dbColumnName
             }, null, 8, ["label", "value"]);
           }), 128))
         ]),

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

@@ -691,7 +691,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     return openBlock(), createBlock(_component_el_option, {
                                       key: index,
                                       label: Ttime.alias,
-                                      value: Ttime.name
+                                      value: Ttime.dbColumnName
                                     }, null, 8, ["label", "value"]);
                                   }), 128))
                                 ]),
@@ -788,7 +788,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                   return openBlock(), createBlock(_component_el_option, {
                                     key: item,
                                     label: item.alias,
-                                    value: item.name
+                                    value: item.dbColumnName
                                   }, null, 8, ["label", "value"]);
                                 }), 128))
                               ]),
@@ -915,7 +915,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     return openBlock(), createBlock(_component_el_option, {
                                       key: item,
                                       label: item.alias,
-                                      value: item.name
+                                      value: item.dbColumnName
                                     }, null, 8, ["label", "value"]);
                                   }), 128))
                                 ]),
@@ -941,7 +941,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                                     return openBlock(), createBlock(_component_el_option, {
                                       key: index,
                                       label: Ttime.alias,
-                                      value: Ttime.name
+                                      value: Ttime.dbColumnName
                                     }, null, 8, ["label", "value"]);
                                   }), 128))
                                 ]),