super-page-designer 2.0.92 → 2.0.93

package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js

@@ -70,19 +70,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         console.log("click contains--------not");
         if (popoverVisible.value) {
-          closePopover(true);
+          closePopover();
         }
       }
     }
     let popoverTimeout = null;
     function closePopover(immediate) {
       clearTimeout(popoverTimeout);
-      if (immediate) {
+      {
         popoverVisible.value = false;
-      } else {
-        popoverTimeout = setTimeout(() => {
-          popoverVisible.value = false;
-        }, 2e3);
       }
     }
     function openPopover() {
@@ -269,12 +265,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       codeType.value = "";
       thisValue.value = "";
       emits("update:modelValue", "", "", "");
-      closePopover(true);
+      closePopover();
     }
     function selectRow(row) {
       thisValue.value = row.code;
       emits("update:modelValue", codeType.value, thisValue.value, row.name, row.id);
-      closePopover(true);
+      closePopover();
     }
     function addCustom() {
       if (!inputCode.value) {
@@ -283,7 +279,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       thisValue.value = inputCode.value;
       emits("update:modelValue", codeType.value, thisValue.value, "");
-      closePopover(true);
+      closePopover();
     }
     console.log("init", props.value, props.type);
     function showPopover() {

package/dist/es/components/design/views/assemblys/common/state-button.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./state-button.vue2.js";
-import "./state-button.vue3.js";
+/* empty css                  */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const StateButton = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ae2798fb"]]);
 export {

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./barcode-attr.vue2.js";
-import "./barcode-attr.vue3.js";
+/* empty css                  */
 export {
   _sfc_main as default
 };

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/composite-header.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./composite-header.vue2.js";
-import "./composite-header.vue3.js";
+/* empty css                      */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b436905c"]]);
 export {

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, createCommentVNode, createElementBlock, Fragment, renderList } from "vue";
 import "@element-plus/icons-vue";
-import "../../form/common/icon-set-dialog.vue3.js";
+/* empty css                                     */
 import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -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,16 @@ 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 +189,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/data-origin-tree.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./data-origin-tree.vue2.js";
-import "./data-origin-tree.vue3.js";
+/* empty css                      */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-97438be5"]]);
 export {

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./data-origin.vue2.js";
-import "./data-origin.vue3.js";
+/* empty css                 */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a8c75465"]]);
 export {

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/component/formatting.vue.js

@@ -1,7 +1,7 @@
 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 { Search } from "@element-plus/icons-vue";
-import "../../form/common/icon-set-dialog.vue3.js";
+/* empty css                                     */
 import _sfc_main$2 from "./formatting-icon-label.vue.js";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

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";
+/* empty css                                     */
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "querySetting",

package/dist/es/components/design/views/assemblys/data/component/row-backgroud-color.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./row-backgroud-color.vue2.js";
-import "./row-backgroud-color.vue3.js";
+/* empty css                         */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const RowBackgroudColor = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b203475d"]]);
 export {

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

@@ -35,8 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const selectValue = ref("");
     function selectChange() {
       emit("update:prop", selectValue);
-      if (selectValue === "dynamicColumnSelect" || selectValue === null)
-        return;
+      if (selectValue === "dynamicColumnSelect" || selectValue === null) return;
       if (props.propType != "") {
         props.tableConfigure.modelFields.forEach((item) => {
           if (item.dbColumnName === selectValue.value) {

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/table-attr-base.vue.js

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./table-attr.vue2.js";
-import "./table-attr.vue3.js";
+/* empty css                */
 export {
   _sfc_main as default
 };

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

@@ -1,6 +1,6 @@
 import _sfc_main from "./table-design.vue2.js";
-import "./table-design.vue3.js";
-import "./table-design.vue4.js";
+/* empty css                  */
+/* empty css                  */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-55bb4cd3"]]);
 export {

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";
+/* empty css                           */
 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
 };