super-page-designer 2.0.93 → 2.0.98

package/dist/es/assets/design-attr.css.js

@@ -0,0 +1 @@
+

package/dist/es/assets/fonts/iconfont.css.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/utils/assemblys-config.js

@@ -3150,7 +3150,8 @@ function getInitialInformationByName(name) {
   return null;
 }
 function getDesignEvents(name) {
-  if (!name) return [];
+  if (!name)
+    return [];
   for (let i = 0; i < assemblyGroups.length; i++) {
     let items = assemblyGroups[i].items;
     for (let j = 0; j < items.length; j++) {

package/dist/es/components/design/utils/chart-design-util.js

@@ -142,7 +142,8 @@ function generateChartOption(configure, chartOption) {
   const isGauge = configure.name == "chart-gauge";
   const isRadar = configure.name == "chart-radar";
   const isScatter = configure.name == "chart-scatter";
-  if (thisProps.title) ;
+  if (thisProps.title)
+    ;
   if (thisProps.subTitle) {
     tempOption.title[0].subtext = thisProps.subTitle;
     if (thisStyle.subtitleTextAlign) {

package/dist/es/components/design/utils/form-design-util.js

@@ -231,7 +231,8 @@ function caculateComponentProps(configure, property) {
     }
     const optionConf = getComponentOptionConfigs(configure, pageDesign);
     if (optionConf) {
-      if (dataOrigin) pageDesign.initOptionConfigs.push(optionConf);
+      if (dataOrigin)
+        pageDesign.initOptionConfigs.push(optionConf);
       tempProps["optionconfigInfo"] = optionConf;
       if (optionConf.props && optionConf.props.monitorFields) {
         for (let fieldName of optionConf.props.monitorFields) {

package/dist/es/components/design/views/assemblys/button/button/button-attr-base.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import "../../../../../../stores/page-store.js";
-/* empty css                                    */
+import "../../form/common/dimension-input.vue.js";
 import _sfc_main$2 from "../../common/common-icon-bind.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";

package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue.js

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

package/dist/es/components/design/views/assemblys/button/button-group/buttongroup-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue.js

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

package/dist/es/components/design/views/assemblys/button/component/journal-set-dialog.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue.js

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

package/dist/es/components/design/views/assemblys/button/dropdown/dropdown-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr.vue.js

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

package/dist/es/components/design/views/assemblys/button/export-pdf/exportpdf-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue.js

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

package/dist/es/components/design/views/assemblys/button/print-label/printlabel-attr.vue3.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/chart/common/common-attr-groupby.vue.js

@@ -78,8 +78,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function afterBindVariable(modelValue, field) {
-      {
+      if (field == "groupVariable") {
         props.configure.props.groupVariable = modelValue;
+      } else if (field == "selGroupVariable") {
+        props.configure.props.selGroupVariable = modelValue;
       }
     }
     const sourceFields = ref([]);
@@ -374,7 +376,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 createVNode(BindVariable, {
                   modelValue: __props.configure.props.groupVariable,
                   paramTypes: ["data", "page"],
-                  "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value))
+                  "onUpdate:modelValue": _cache[4] || (_cache[4] = (value) => afterBindVariable(value, "groupVariable"))
                 }, null, 8, ["modelValue"])
               ]),
               _: 1

package/dist/es/components/design/views/assemblys/chart/gauge/series/styles/style-axislabel.vue.js

@@ -13,7 +13,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const fontSizes = ["8", "10", "12", "14", "16", "18", "20", "24", "28"];
     const isPieAttr = ref(true);
-    if (props.chartType == "seriesChart") ;
+    if (props.chartType == "seriesChart")
+      ;
     else {
       isPieAttr.value = false;
     }

package/dist/es/components/design/views/assemblys/common/common-advanced-basic-showcondition.vue.js

@@ -118,7 +118,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let dataType = "";
         if (val && val.startsWith("${")) {
           let propName = val.substring(2, val.length - 1);
-          if (propName.startsWith("page.")) ;
+          if (propName.startsWith("page."))
+            ;
           else if (propName.startsWith("data.")) {
             propName = propName.substring(5);
             dataType = pageDesignUtil.getModelField(propName);

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

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

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue3.js

@@ -165,7 +165,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         console.log("click contains--------not");
         if (popoverVisible.value) {
-          closePopover();
+          closePopover(true);
         }
       }
     }
@@ -200,8 +200,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let popoverTimeout = null;
     function closePopover(immediate) {
       clearTimeout(popoverTimeout);
-      {
+      if (immediate) {
         popoverVisible.value = false;
+      } else {
+        popoverTimeout = setTimeout(() => {
+          popoverVisible.value = false;
+        }, 2e3);
       }
     }
     function openPopover() {
@@ -358,7 +362,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
       emits("update:modelValue", defalutValue.value, row.alias);
-      closePopover();
+      closePopover(true);
     }
     function addRequestParam(paramName) {
       paramValue.value = paramName;
@@ -371,7 +375,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       defalutValue.value = "${" + paramType.value + "." + paramValue.value + "}";
       emits("update:modelValue", defalutValue.value);
-      closePopover();
+      closePopover(true);
     }
     function addPageParams() {
       searchValue.value = searchValue.value.trim();
@@ -404,7 +408,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       defalutValue.value = "${" + paramType.value + "." + searchValue.value + "}";
       searchValue.value = "";
       emits("update:modelValue", defalutValue.value);
-      closePopover();
+      closePopover(true);
     }
     function getValueLabel(valueType, value) {
       if (selectInputType.includes(valueType)) {

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

@@ -70,15 +70,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         console.log("click contains--------not");
         if (popoverVisible.value) {
-          closePopover();
+          closePopover(true);
         }
       }
     }
     let popoverTimeout = null;
     function closePopover(immediate) {
       clearTimeout(popoverTimeout);
-      {
+      if (immediate) {
         popoverVisible.value = false;
+      } else {
+        popoverTimeout = setTimeout(() => {
+          popoverVisible.value = false;
+        }, 2e3);
       }
     }
     function openPopover() {
@@ -265,12 +269,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       codeType.value = "";
       thisValue.value = "";
       emits("update:modelValue", "", "", "");
-      closePopover();
+      closePopover(true);
     }
     function selectRow(row) {
       thisValue.value = row.code;
       emits("update:modelValue", codeType.value, thisValue.value, row.name, row.id);
-      closePopover();
+      closePopover(true);
     }
     function addCustom() {
       if (!inputCode.value) {
@@ -279,7 +283,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       thisValue.value = inputCode.value;
       emits("update:modelValue", codeType.value, thisValue.value, "");
-      closePopover();
+      closePopover(true);
     }
     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";
-/* empty css                  */
+import "./state-button.vue3.js";
 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/common/state-button.vue3.js

@@ -0,0 +1 @@
+

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";
-/* empty css                  */
+import "./barcode-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -0,0 +1 @@
+

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";
-/* empty css                      */
+import "./composite-header.vue3.js";
 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/composite-header.vue3.js

@@ -0,0 +1 @@
+

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";
-/* empty css                                     */
+import "../../form/common/icon-set-dialog.vue3.js";
 import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -125,11 +125,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("close");
     }
     function dataTypeChange(value) {
-      if (value === "keyValuePair") ;
+      if (value === "keyValuePair")
+        ;
       else if (value === "optionGroup") {
         queryOptionGroups(true);
-      } else if (value === "enumname") ;
-      else if (value === "beanname") ;
+      } else if (value === "enumname")
+        ;
+      else if (value === "beanname")
+        ;
       else if (value === "dynamicDataSource") {
         echoDataOrigin("");
       }

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";
-/* empty css                      */
+import "./data-origin-tree.vue3.js";
 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-tree.vue3.js

@@ -0,0 +1 @@
+

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";
-/* empty css                 */
+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-a8c75465"]]);
 export {

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

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, renderSlot } from "vue";
-import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue2.js";
+import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
 import { Codemirror } from "vue-codemirror";
 import _sfc_main$6 from "../../workflow/component/combination.vue.js";
 import _sfc_main$5 from "./return-set-table.vue.js";

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

@@ -0,0 +1 @@
+

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";
-/* empty css                                     */
+import "../../form/common/icon-set-dialog.vue3.js";
 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";
-/* empty css                                     */
+import "../../form/common/icon-set-dialog.vue3.js";
 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";
-/* empty css                         */
+import "./row-backgroud-color.vue3.js";
 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/row-backgroud-color.vue3.js

@@ -0,0 +1 @@
+

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

@@ -35,7 +35,8 @@ 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-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";
-/* empty css                                     */
+import "../../common/common-variable-bind.vue2.js";
 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";
-/* empty css                */
+import "./table-attr.vue3.js";
 export {
   _sfc_main as default
 };

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

@@ -0,0 +1 @@
+

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";
-/* empty css                  */
-/* empty css                  */
+import "./table-design.vue3.js";
+import "./table-design.vue4.js";
 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/table-design.vue3.js

@@ -0,0 +1 @@
+

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

@@ -0,0 +1 @@
+

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

@@ -1,5 +1,5 @@
 import _sfc_main from "./tablecolumn-attr-base.vue2.js";
-/* empty css                           */
+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-c93dc980"]]);
 export {

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

@@ -0,0 +1 @@
+

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

@@ -7,6 +7,7 @@ import { queryTableFields } from "../../../../utils/page-table-util.js";
 import _sfc_main$2 from "../../form/common/condition.vue.js";
 import _sfc_main$3 from "../component/dynamic-column.vue.js";
 import _sfc_main$5 from "../component/configuration-value.vue.js";
+import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = ["onClick"];
 const _hoisted_3 = /* @__PURE__ */ createElementVNode("span", null, "列模型设置", -1);
@@ -46,9 +47,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let clolumnTableFields = ref([]);
     const groupTitleValueSet = ref({});
     function dynamicColumnDataSourcesChange(value) {
+      var _a;
       if (value === "service" && !props.configure.props.dynamicColumnData.service) {
         props.configure.props.dynamicColumnData.service = {};
+      } else if (value === "dataTable") {
+        queryTableFieldsByTable();
+      } else if (value === "optionGroup") {
+        props.configure.props.dynamicColumnData.optionGroup = "";
       }
+      if (value === "optionGroup" && ((_a = props.configure.props.dynamicColumnData) == null ? void 0 : _a.mergeFieldType) === "more") {
+        props.configure.props.dynamicColumnData.mergeFieldLabelTemp = "选项值";
+        props.configure.props.dynamicColumnData.mergeField = "_optionValue_";
+      } else {
+        delete props.configure.props.dynamicColumnData.mergeFieldLabelTemp;
+        delete props.configure.props.dynamicColumnData.mergeField;
+      }
+    }
+    const queryOptionGroupLoading = ref(false);
+    const optionGroups = ref([]);
+    function queryOptionGroups(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);
+      });
     }
     function afterSelectService(type, code, name) {
       props.configure.props.dynamicColumnData.service.simpleCode = code;
@@ -176,10 +204,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       debugger;
     }
     onMounted(() => {
-      var _a, _b;
+      var _a, _b, _c;
       if (((_a = props.configure.props.base) == null ? void 0 : _a.prop) === "dynamicColumnSelect") {
         if (((_b = props.configure.props.dynamicColumnData) == null ? void 0 : _b.dataSources) === "dataTable" && props.configure.props.dynamicColumnData.dataTableCode) {
           queryTableFieldsByTable();
+        } else if (((_c = props.configure.props.dynamicColumnData) == null ? void 0 : _c.dataSources) === "optionGroup" && props.configure.props.dynamicColumnData.optionGroup) {
+          queryOptionGroups("");
         }
         if (props.configure.props.dynamicColumnData && props.configure.props.dynamicColumnData.settingDataTableCode) {
           queryTableFieldsByTableSublist();
@@ -444,11 +474,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       clearable: "",
                       placeholder: "请选择",
                       "remote-show-suffix": "",
-                      "remote-method": _ctx.queryOptionGroups,
-                      loading: _ctx.queryOptionGroupLoading
+                      "remote-method": queryOptionGroups,
+                      loading: queryOptionGroupLoading.value
                     }, {
                       default: withCtx(() => [
-                        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.optionGroups, (item) => {
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(optionGroups.value, (item) => {
                           return openBlock(), createBlock(_component_el_option, {
                             key: item.code,
                             label: item.name + "(" + item.code + ")",
@@ -457,7 +487,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }), 128))
                       ]),
                       _: 1
-                    }, 8, ["modelValue", "remote-method", "loading"])
+                    }, 8, ["modelValue", "loading"])
                   ]),
                   _: 1
                 }, 512), [
@@ -634,7 +664,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   class: "amb-design-attr-item"
                 }, {
                   default: withCtx(() => [
-                    createVNode(_component_el_select, {
+                    __props.configure.props.dynamicColumnData.dataSources === "dataTable" ? (openBlock(), createBlock(_component_el_select, {
+                      key: 0,
                       modelValue: __props.configure.props.dynamicColumnData.mergeField,
                       "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.dynamicColumnData.mergeField = $event),
                       filterable: "",
@@ -651,7 +682,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }), 128))
                       ]),
                       _: 1
-                    }, 8, ["modelValue"])
+                    }, 8, ["modelValue"])) : __props.configure.props.dynamicColumnData.dataSources === "optionGroup" ? (openBlock(), createBlock(_component_el_input, {
+                      key: 1,
+                      disabled: true,
+                      modelValue: __props.configure.props.dynamicColumnData.mergeFieldLabelTemp,
+                      "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.dynamicColumnData.mergeFieldLabelTemp = $event)
+                    }, null, 8, ["modelValue"])) : __props.configure.props.dynamicColumnData.dataSources === "sql" ? (openBlock(), createBlock(_component_el_input, {
+                      key: 2,
+                      modelValue: __props.configure.props.dynamicColumnData.mergeField,
+                      "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => __props.configure.props.dynamicColumnData.mergeField = $event)
+                    }, null, 8, ["modelValue"])) : createCommentVNode("", true)
                   ]),
                   _: 1
                 })) : createCommentVNode("", true),
@@ -664,7 +704,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx(() => [
                     createVNode(_component_el_select, {
                       modelValue: __props.configure.props.dynamicColumnData.mergeTitleContentJoinField,
-                      "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.dynamicColumnData.mergeTitleContentJoinField = $event),
+                      "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => __props.configure.props.dynamicColumnData.mergeTitleContentJoinField = $event),
                       filterable: "",
                       clearable: "",
                       placeholder: "请选择"

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

@@ -48,9 +48,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.props.base.prop = modelValue;
     }
     function afterBindIcon(iconType, iconValue, fieldType) {
-      {
+      if (fieldType == "suf") {
         props.configure.props.base.iconType = iconType;
         props.configure.props.base.iconType = iconValue;
+      } else {
+        props.configure.props.base.iconType = iconType;
+        props.configure.props.base.icon = iconValue;
       }
     }
     return (_ctx, _cache) => {
@@ -329,7 +332,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         createVNode(_sfc_main$1, {
                           iconType: __props.configure.props.base.iconType,
                           iconValue: __props.configure.props.base.icon,
-                          "onUpdate:modelValue": _cache[9] || (_cache[9] = (iconType, iconValue) => afterBindIcon(iconType, iconValue))
+                          "onUpdate:modelValue": _cache[9] || (_cache[9] = (iconType, iconValue) => afterBindIcon(iconType, iconValue, "suf"))
                         }, null, 8, ["iconType", "iconValue"])
                       ]),
                       _: 1

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

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

package/dist/es/components/design/views/assemblys/data/tree/tree-attr.vue3.js

@@ -0,0 +1 @@
+

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

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

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

@@ -0,0 +1 @@
+

package/dist/es/components/design/views/assemblys/form/common/attr-event.vue.js

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

package/dist/es/components/design/views/assemblys/form/common/attr-event.vue3.js

@@ -0,0 +1 @@
+