super-page-designer 2.0.41 → 2.0.45

package/dist/es/components/design/views/assemblys/form/checkbox/checkbox-attr-advanced.vue.js

@@ -25,7 +25,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
-              createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"])
+              createVNode(_sfc_main$1, {
+                configure: __props.configure,
+                type: "form"
+              }, null, 8, ["configure"])
             ]),
             _: 1
           }, 8, ["modelValue"])

package/dist/es/components/design/views/assemblys/form/common/condition.vue.js

@@ -6,7 +6,10 @@ const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "condition",
   props: {
-    list: Object,
+    list: {
+      type: Array,
+      default: () => []
+    },
     title: String
   },
   setup(__props, { expose: __expose }) {

package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js

@@ -6,7 +6,7 @@ import "uuid";
 import "@element-plus/icons-vue";
 import http from "agilebuilder-ui/src/utils/request";
 import { usePageContextStore } from "../../../../../../stores/page-store.js";
-import "../../common/common-variable-bind.vue3.js";
+import "../../common/common-variable-bind.vue2.js";
 import _sfc_main$4 from "./data-origin-service-in.vue.js";
 import { queryTableFields } from "../../../../utils/page-table-util.js";
 import _sfc_main$5 from "../../common/common-select-table.vue.js";

package/dist/es/components/design/views/assemblys/form/common/data-origin-autoset.vue.js

@@ -146,7 +146,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   "remote-show-suffix": ""
                 }, {
                   default: withCtx(() => [
-                    (openBlock(true), createElementBlock(Fragment, null, renderList(sourceFields.value, (item) => {
+                    _ctx.dataOrigin.optionValueSetType === "dynamicData" ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(sourceFields.value, (item) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: item.value,
+                        label: item.label + "(" + item.value + ")",
+                        value: item.value
+                      }, null, 8, ["label", "value"]);
+                    }), 128)) : (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(sourceFields.value, (item) => {
                       return openBlock(), createBlock(_component_el_option, {
                         key: item.dbColumnName ? item.dbColumnName : item.name,
                         label: item.alias + "(" + (item.dbColumnName ? item.dbColumnName : item.name) + ")",

package/dist/es/components/design/views/assemblys/form/common/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-9e39da6a"]]);
+const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6dd67d1b"]]);
 export {
   DataOrigin as default
 };

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

@@ -1,20 +1,30 @@
-import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, withDirectives, vShow, unref, createCommentVNode, createElementBlock, Fragment, renderList, normalizeClass } from "vue";
-import "@element-plus/icons-vue";
-import _sfc_main$2 from "./condition.vue.js";
-import _sfc_main$1 from "./row-ul-li.vue.js";
-import _sfc_main$5 from "./data-origin-autoset.vue.js";
-import _sfc_main$4 from "./data-origin-service-in.vue.js";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, withDirectives, createTextVNode, vShow, createCommentVNode, unref, createElementBlock, Fragment, renderList, normalizeClass } from "vue";
+import _sfc_main$1 from "../../data/component/variate-select.vue.js";
+import _sfc_main$3 from "./condition.vue.js";
+import _sfc_main$2 from "./row-ul-li.vue.js";
+import _sfc_main$6 from "./data-origin-autoset.vue.js";
+import _sfc_main$5 from "./data-origin-service-in.vue.js";
 import { queryTableFields } from "../../../../utils/page-table-util.js";
-import _sfc_main$6 from "../../common/common-select-table.vue.js";
+import _sfc_main$7 from "../../common/common-select-table.vue.js";
 import { Search, Close } from "@element-plus/icons";
 import http from "agilebuilder-ui/src/utils/request";
 import { usePageContextStore } from "../../../../../../stores/page-store.js";
-import _sfc_main$3 from "../../common/page-permission-select.vue.js";
+import _sfc_main$4 from "../../common/page-permission-select.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "data-origin",
   props: {
+    // 是否是动态列
+    isDynamicColumn: {
+      type: Boolean,
+      default: false
+    },
+    // 表格总体数据
+    tableConfigure: {
+      type: Object,
+      default: () => ({ props: {} })
+    },
     configure: {
       type: Object,
       default: {}
@@ -25,7 +35,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       default: true
     }
   },
-  setup(__props) {
+  emits: ["propDataOriginField"],
+  setup(__props, { emit: __emit }) {
     const props = __props;
     const pageContextUtil = usePageContextStore();
     const pageDesign = pageContextUtil.pageContext;
@@ -39,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (!dataOriginInfo.filterList) {
       dataOriginInfo.filterList = [];
     }
+    const $emit = __emit;
     const conditionRef = ref(null);
     const selectTableDialog = ref(null);
     const atPresentSortIndex = ref("");
@@ -92,7 +104,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function dynamicSourceChange(value) {
       const selectedItem = dynamicSources.value.find((item) => item.code === value);
       if (selectedItem) {
-        dataOriginInfo.dynamicDataSourceFields = selectedItem.outFields;
+        let field = JSON.parse(selectedItem.selectedField);
+        dataOriginInfo.dynamicDataSourceFields = field;
       } else {
         dataOriginInfo.dynamicDataSourceFields = [];
       }
@@ -148,6 +161,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       queryTableFields(systemCode, systemVersion, tableName).then((resultFields) => {
         tableFields.value = resultFields;
+        $emit("propDataOriginField", resultFields);
         optionValueTypeChange();
       }).catch((error) => {
         console.log("数据源中查询表字段失败!", error);
@@ -177,11 +191,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_radio = resolveComponent("el-radio");
       const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_form_item = resolveComponent("el-form-item");
+      const _component_el_input = resolveComponent("el-input");
       const _component_el_radio_button = resolveComponent("el-radio-button");
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_button = resolveComponent("el-button");
-      const _component_el_input = resolveComponent("el-input");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       return openBlock(), createBlock(_component_el_collapse_item, {
         title: "数据源",
@@ -201,30 +215,42 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   onChange: optionValueTypeChange
                 }, {
                   default: withCtx(() => [
-                    createVNode(_component_el_radio, { value: "static" }, {
+                    withDirectives(createVNode(_component_el_radio, { value: "static" }, {
                       default: withCtx(() => [
                         createTextVNode("静态数据")
                       ]),
                       _: 1
-                    }),
+                    }, 512), [
+                      [vShow, !__props.isDynamicColumn]
+                    ]),
                     createVNode(_component_el_radio, { value: "optionGroup" }, {
                       default: withCtx(() => [
                         createTextVNode("选项组")
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_radio, { value: "dynamicData" }, {
+                    withDirectives(createVNode(_component_el_radio, { value: "dynamicData" }, {
                       default: withCtx(() => [
                         createTextVNode("动态数据源")
                       ]),
                       _: 1
-                    }),
+                    }, 512), [
+                      [vShow, !__props.isDynamicColumn]
+                    ]),
                     createVNode(_component_el_radio, { value: "dataTable" }, {
                       default: withCtx(() => [
                         createTextVNode("数据表/视图")
                       ]),
                       _: 1
                     }),
+                    withDirectives(createVNode(_component_el_radio, { value: "sql" }, {
+                      default: withCtx(() => [
+                        createTextVNode("SQL语句")
+                      ]),
+                      _: 1
+                    }, 512), [
+                      [vShow, __props.isDynamicColumn]
+                    ]),
                     createVNode(_component_el_radio, { value: "service" }, {
                       default: withCtx(() => [
                         createTextVNode("服务")
@@ -237,6 +263,39 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }),
+            __props.isDynamicColumn ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 0,
+              label: "监控字段",
+              title: "监控主表字段",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                createVNode(_sfc_main$1, {
+                  prop: __props.configure.props.dataOrigin.watchParentAttr,
+                  "onUpdate:prop": _cache[1] || (_cache[1] = ($event) => __props.configure.props.dataOrigin.watchParentAttr = $event),
+                  propType: __props.configure.props.dataOrigin.watchParentAttrType,
+                  "onUpdate:propType": _cache[2] || (_cache[2] = ($event) => __props.configure.props.dataOrigin.watchParentAttrType = $event),
+                  tableConfigure: __props.tableConfigure
+                }, null, 8, ["prop", "propType", "tableConfigure"])
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            withDirectives(createVNode(_component_el_form_item, {
+              label: "SQL",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_input, {
+                  modelValue: __props.configure.props.dataOrigin.sql,
+                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.dataOrigin.sql = $event),
+                  rows: 2,
+                  type: "textarea"
+                }, null, 8, ["modelValue"])
+              ]),
+              _: 1
+            }, 512), [
+              [vShow, __props.configure.props.dataOrigin.optionValueSetType === "sql"]
+            ]),
             withDirectives(createVNode(_component_el_form_item, {
               label: "可搜索",
               class: "amb-design-attr-item"
@@ -244,7 +303,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_radio_group, {
                   modelValue: __props.configure.props.dataOrigin.filterType,
-                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.dataOrigin.filterType = $event),
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.filterType = $event),
                   class: "ml-4"
                 }, {
                   default: withCtx(() => [
@@ -279,8 +338,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 512), [
               [vShow, __props.configure.name == "select"]
             ]),
-            !__props.configure.props.dataOrigin.optionValueSetType || __props.configure.props.dataOrigin.optionValueSetType === "static" ? (openBlock(), createBlock(_sfc_main$1, {
-              key: 0,
+            !__props.configure.props.dataOrigin.optionValueSetType || __props.configure.props.dataOrigin.optionValueSetType === "static" ? (openBlock(), createBlock(_sfc_main$2, {
+              key: 1,
               style: { "margin-bottom": "10px", "border-top": "1px solid var(--el-border-color-lighter)" },
               dataOrigin: unref(dataOriginInfo),
               type: "select",
@@ -294,7 +353,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.configure.props.dataOrigin.optionGroup,
-                  "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.dataOrigin.optionGroup = $event),
+                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.dataOrigin.optionGroup = $event),
                   filterable: "",
                   remote: "",
                   "reserve-keyword": "",
@@ -321,14 +380,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               [vShow, __props.configure.props.dataOrigin.optionValueSetType === "optionGroup"]
             ]),
             __props.configure.props.dataOrigin.optionValueSetType === "dynamicData" ? (openBlock(), createBlock(_component_el_form_item, {
-              key: 1,
+              key: 2,
               label: "动态数据源",
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.configure.props.dataOrigin.dynamicDataSourceCode,
-                  "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.dataOrigin.dynamicDataSourceCode = $event),
+                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.dataOrigin.dynamicDataSourceCode = $event),
                   filterable: "",
                   remote: "",
                   "reserve-keyword": "",
@@ -360,7 +419,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input, {
                   modelValue: __props.configure.props.dataOrigin.tableName,
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.dataOrigin.tableName = $event),
+                  "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.dataOrigin.tableName = $event),
                   title: __props.configure.props.dataOrigin.tableName,
                   clearable: "",
                   readonly: "true"
@@ -392,7 +451,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.configure.props.dataOrigin.tableValueField,
-                  "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.dataOrigin.tableValueField = $event),
+                  "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.dataOrigin.tableValueField = $event),
                   "allow-create": "",
                   filterable: "",
                   "reserve-keyword": "",
@@ -423,7 +482,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: __props.configure.props.dataOrigin.tableLableField,
-                  "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.dataOrigin.tableLableField = $event),
+                  "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.dataOrigin.tableLableField = $event),
                   "allow-create": "",
                   filterable: "",
                   "reserve-keyword": "",
@@ -448,7 +507,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               [vShow, __props.configure.props.dataOrigin.optionValueSetType === "dataTable"]
             ]),
             __props.configure.props.dataOrigin.optionValueSetType === "dataTable" ? (openBlock(), createBlock(_component_el_form_item, {
-              key: 2,
+              key: 3,
               label: "排序",
               class: "amb-design-attr-item"
             }, {
@@ -525,7 +584,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_input, {
                   modelValue: __props.configure.props.dataOrigin.displayQuantity,
-                  "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.dataOrigin.displayQuantity = $event),
+                  "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.dataOrigin.displayQuantity = $event),
                   placeholder: "请输入"
                 }, null, 8, ["modelValue"])
               ]),
@@ -538,7 +597,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
-                createVNode(_sfc_main$2, {
+                createVNode(_sfc_main$3, {
                   title: "过滤条件",
                   list: __props.configure.props.dataOrigin.filterList,
                   ref_key: "conditionRef",
@@ -554,11 +613,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
-                createVNode(_sfc_main$3, {
+                createVNode(_sfc_main$4, {
                   pageDesign: unref(pageDesign),
                   rowObj: unref(dataOriginInfo).service,
                   onlyService: "",
-                  "onUpdate:modelValue": _cache[8] || (_cache[8] = (type, code, name) => afterSelectService(type, code, name))
+                  "onUpdate:modelValue": _cache[11] || (_cache[11] = (type, code, name) => afterSelectService(type, code, name))
                 }, null, 8, ["pageDesign", "rowObj"])
               ]),
               _: 1
@@ -572,7 +631,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: unref(dataOriginInfo).serviceDataSetField,
-                  "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => unref(dataOriginInfo).serviceDataSetField = $event),
+                  "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => unref(dataOriginInfo).serviceDataSetField = $event),
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
@@ -595,7 +654,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: unref(dataOriginInfo).serviceValueField,
-                  "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => unref(dataOriginInfo).serviceValueField = $event),
+                  "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => unref(dataOriginInfo).serviceValueField = $event),
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
@@ -618,7 +677,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_select, {
                   modelValue: unref(dataOriginInfo).serviceLabelField,
-                  "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => unref(dataOriginInfo).serviceLabelField = $event),
+                  "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => unref(dataOriginInfo).serviceLabelField = $event),
                   placeholder: "请选择"
                 }, {
                   default: withCtx(() => [
@@ -634,24 +693,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, 512), [
               [vShow, unref(dataOriginInfo).optionValueSetType == "service"]
             ]),
-            withDirectives(createVNode(_sfc_main$4, {
+            withDirectives(createVNode(_sfc_main$5, {
               ref: "dataOriginServiceInRef",
               dataOrigin: unref(dataOriginInfo)
             }, null, 8, ["dataOrigin"]), [
               [vShow, __props.configure.props.dataOrigin.optionValueSetType == "service"]
             ]),
-            withDirectives(createVNode(_sfc_main$5, {
+            withDirectives(createVNode(_sfc_main$6, {
               ref_key: "dataOriginAutosetRef",
               ref: dataOriginAutosetRef,
               dataOrigin: unref(dataOriginInfo)
             }, null, 8, ["dataOrigin"]), [
               [
                 vShow,
-                __props.configure.props.dataOrigin.optionValueSetType == "dataTable" || __props.configure.props.dataOrigin.optionValueSetType == "dynamicData" || __props.configure.props.dataOrigin.optionValueSetType == "service"
+                !__props.isDynamicColumn && (__props.configure.props.dataOrigin.optionValueSetType == "dataTable" || __props.configure.props.dataOrigin.optionValueSetType == "dynamicData" || __props.configure.props.dataOrigin.optionValueSetType == "service")
               ]
             ])
           ]),
-          createVNode(_sfc_main$6, {
+          createVNode(_sfc_main$7, {
             ref_key: "selectTableDialog",
             ref: selectTableDialog,
             onSelectTable,