super-page-designer 2.0.92 → 2.0.96

package/dist/es/components/design/utils/interfaces/page-design-types.d.ts

@@ -75,6 +75,7 @@ export interface PageDesign extends Component {
         [uuid: string]: object;
     };
     i18nLabels?: Array<object>;
+    listCodesMap?: object;
 }
 /**
  * 页面资源

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

@@ -126,7 +126,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         operation.props.base.displayOrder = fieldColumns.length;
         fieldColumns.push(operation);
       }
-      debugger;
       return fieldColumns;
     }
     function onRowClick(obj) {

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

@@ -31,10 +31,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formData.value.type = "";
       }
       if (!formData.value.valueSetOptions || formData.value.valueSetOptions.length == 0) {
-        formData.value.valueSetOptions = [{
-          columnName: "",
-          valueColumn: ""
-        }];
+        formData.value.valueSetOptions = [
+          {
+            columnName: "",
+            valueColumn: ""
+          }
+        ];
       }
     }
     const valueSettingBeannameTableSelect = ref({});
@@ -51,22 +53,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const queryOptionGroupLoading = ref(false);
     const optionGroups = ref([]);
     function queryOptionGroups(query) {
-      if (query) {
-        queryOptionGroupLoading.value = true;
-        const param = {
-          query
-        };
-        http.post(window.$vueApp.config.globalProperties.baseAPI + "/component/option-groups/query", param).then((result) => {
-          queryOptionGroupLoading.value = false;
-          optionGroups.value = result;
-        }).catch((error) => {
-          queryOptionGroupLoading.value = false;
-          console.log("查询选项组出错", error);
-        });
-      } else {
-        optionGroups.value = [];
+      queryOptionGroupLoading.value = true;
+      const param = {
+        query
+      };
+      http.post(window.$vueApp.config.globalProperties.baseAPI + "/component/option-groups/query", param).then((result) => {
         queryOptionGroupLoading.value = false;
-      }
+        optionGroups.value = result;
+      }).catch((error) => {
+        queryOptionGroupLoading.value = false;
+        console.log("查询选项组出错", error);
+      });
     }
     const queryDynamicSourceLoading = ref(false);
     const dynamicSources = ref([]);
@@ -127,6 +124,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function beforeClose() {
       emit("close");
     }
+    function dataTypeChange(value) {
+      if (value === "keyValuePair")
+        ;
+      else if (value === "optionGroup") {
+        queryOptionGroups(true);
+      } else if (value === "enumname")
+        ;
+      else if (value === "beanname")
+        ;
+      else if (value === "dynamicDataSource") {
+        echoDataOrigin("");
+      }
+    }
     __expose({
       echoDataOrigin
     });
@@ -182,6 +192,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   createVNode(_component_el_select, {
                     modelValue: formData.value.type,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => formData.value.type = $event),
+                    onChange: dataTypeChange,
                     placeholder: "请选择"
                   }, {
                     default: withCtx(() => [

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

@@ -97,14 +97,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       } else {
         props.configure.props.dynamicColumnData.columnModelTable[columnModelTableRowIndex.value].dynamicDataSourceData = configObj;
       }
-      console.log("%c描述-173933", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dynamicColumnData.columnModelTable);
+      console.log(
+        "%c描述-173933",
+        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+        props.configure.props.dynamicColumnData.columnModelTable
+      );
     }
     function configurationClose() {
       configurationVisible.value = false;
     }
     function formattingAdd(formattingData2) {
       props.configure.props.dynamicColumnData.columnModelTable[columnModelTableRowIndex.value].listColumnFormat = formattingData2;
-      console.log("%c描述-195126", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dynamicColumnData.columnModelTable);
+      console.log(
+        "%c描述-195126",
+        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
+        props.configure.props.dynamicColumnData.columnModelTable
+      );
     }
     function formattingClose() {
       formattingVisible.value = false;
@@ -142,7 +150,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 512), [
-            [vShow, __props.configure.props.dynamicColumnData.columnModelTable && __props.configure.props.dynamicColumnData.columnModelTable.length > 0]
+            [
+              vShow,
+              __props.configure.props.dynamicColumnData.columnModelTable && __props.configure.props.dynamicColumnData.columnModelTable.length > 0
+            ]
           ])
         ]),
         createVNode(_component_el_dialog, {

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

@@ -67,7 +67,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     onMounted(() => {
-      debugger;
       const systemCode = props.configure.props.otherSettings.tableSysCode ? props.configure.props.otherSettings.tableSysCode : props.pageDesign.systemCode;
       const systemVersion = props.configure.props.otherSettings.tableSysVersion ? props.configure.props.otherSettings.tableSysVersion : props.pageDesign.version;
       const tableName = props.configure.props.otherSettings.sourceDataTable;
@@ -1049,14 +1048,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               }, null, 8, ["systemCode", "systemVersion"]),
               combinationVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
                 key: 0,
-                conditionList: __props.configure.props.otherSettings.sourceQueryTableData,
+                list: __props.configure.props.otherSettings.sourceQueryTableData ? JSON.parse(__props.configure.props.otherSettings.sourceQueryTableData) : null,
                 fieldNameList: modelFields.value,
                 fieldMap: modelFieldsMap.value,
                 dataFieldNameList: __props.pageDesign.modelFields,
                 paramTypes: ["data", "page", "task", "context", "system", "request", "fixed"],
                 onSave: saveCondition,
                 onClose: closeCombination
-              }, null, 8, ["conditionList", "fieldNameList", "fieldMap", "dataFieldNameList"])) : createCommentVNode("", true)
+              }, null, 8, ["list", "fieldNameList", "fieldMap", "dataFieldNameList"])) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["modelValue"]),

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./tablecolumn-attr-base.vue2.js";
 import "./tablecolumn-attr-base.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-9d69c477"]]);
+const TablecolumnAttrBase = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c93dc980"]]);
 export {
   TablecolumnAttrBase as default
 };