@ibiz-template/vue3-components 0.2.8 → 0.2.10

package/lib/common/data-import/data-import.cjs

@@ -0,0 +1,149 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./data-import.css');
+var runtime = require('@ibiz-template/runtime');
+
+"use strict";
+const DataImport = /* @__PURE__ */ vue.defineComponent({
+  name: "DataImport",
+  props: {
+    dismiss: {
+      type: Function,
+      required: true
+    },
+    appDataEntity: {
+      type: Object,
+      required: true
+    }
+  },
+  setup(props) {
+    const ns = vue3Util.useNamespace("data-import");
+    const inputUpLoad = vue.ref();
+    const message = vue.ref({
+      state: "ready",
+      message: ""
+    });
+    const isLoading = vue.ref(false);
+    const onFileChange = async ($event) => {
+      const obj = $event.target;
+      if (!obj.files) {
+        return;
+      }
+      const selectedFile = obj.files[0];
+      obj.value = null;
+      let result;
+      isLoading.value = true;
+      try {
+        if (ibiz.env.enableMqtt) {
+          result = await runtime.asyncImportData(selectedFile, props.appDataEntity);
+        } else {
+          result = await runtime.importData(selectedFile, props.appDataEntity);
+        }
+        ibiz.mc.command.send({
+          srfdecodename: props.appDataEntity.codeName
+        }, "OBJECTCREATED");
+        const {
+          success,
+          total,
+          message: _message
+        } = result;
+        const totalNum = total ? Number(total) : 0;
+        const successNum = success ? Number(success) : 0;
+        const errorNum = total - success;
+        message.value.state = _message ? "error" : "over";
+        message.value.message = _message || `\u5171\u8BA1\u5BFC\u5165\u6570\u636E ${totalNum} \u6761\uFF0C\u9519\u8BEF[${errorNum}]\uFF0C\u6210\u529F[${successNum}]`;
+      } finally {
+        isLoading.value = false;
+      }
+    };
+    const onLinkClick = async () => {
+      var _a;
+      const templateUrl = `${props.appDataEntity.codeName2.toLowerCase()}/importtemplate`;
+      const res = await ibiz.net.request(templateUrl, {
+        responseType: "blob"
+      });
+      if (res.status === 200) {
+        let fileName = ((_a = res.headers["content-disposition"].split(";").find((str) => str.indexOf("filename=") !== -1)) == null ? void 0 : _a.slice(9)) || "";
+        fileName = decodeURIComponent(fileName);
+        const blob = new Blob([res.data], {
+          type: "application/vnd.ms-excel"
+        });
+        const elink = document.createElement("a");
+        elink.download = fileName;
+        elink.style.display = "none";
+        elink.href = URL.createObjectURL(blob);
+        document.body.appendChild(elink);
+        elink.click();
+        URL.revokeObjectURL(elink.href);
+        document.body.removeChild(elink);
+      }
+    };
+    const selectFile = () => {
+      inputUpLoad.value.click();
+    };
+    const onCancelButtonClick = () => {
+      props.dismiss();
+    };
+    return {
+      ns,
+      onLinkClick,
+      selectFile,
+      onCancelButtonClick,
+      onFileChange,
+      inputUpLoad,
+      isLoading,
+      message
+    };
+  },
+  render() {
+    return vue.withDirectives(vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode("input", {
+      "ref": "inputUpLoad",
+      "type": "file",
+      "style": "display: none",
+      "accept": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "onChange": this.onFileChange
+    }, null), vue.createVNode("div", {
+      "class": this.ns.e("caption")
+    }, [vue.createTextVNode("\u5BFC\u5165\u6570\u636E")]), this.message.state === "ready" ? vue.createVNode("div", {
+      "class": this.ns.b("upload"),
+      "onClick": this.selectFile
+    }, [vue.createVNode("img", {
+      "class": this.ns.be("upload", "img"),
+      "src": "./assets/images/icon-import.svg"
+    }, null), vue.createVNode("span", {
+      "class": this.ns.be("upload", "text")
+    }, [vue.createTextVNode("\u5355\u51FB\u6B64\u533A\u57DF\u8FDB\u884C\u4E0A\u4F20")])]) : vue.createVNode("div", {
+      "class": [this.ns.b("message")]
+    }, [vue.createVNode("div", {
+      "class": this.ns.be("message", "title")
+    }, [vue.createTextVNode("\u5BFC\u5165\u7ED3\u679C")]), vue.createVNode("div", {
+      "class": [this.ns.be("message", "content"), this.ns.is("error", this.message.state === "error")]
+    }, [this.message.message])]), vue.createVNode("div", {
+      "class": this.ns.e("template-container")
+    }, [vue.createVNode("div", {
+      "class": this.ns.e("template-description")
+    }, [vue.createTextVNode("\u4E0B\u8F7D\u5BFC\u5165\u6A21\u7248\uFF0C\u5E76\u6309\u8981\u6C42\u586B\u5199\uFF1A")]), vue.createVNode("div", {
+      "class": this.ns.e("template-link"),
+      "onClick": this.onLinkClick
+    }, [vue.createVNode("ion-icon", {
+      "class": this.ns.e("link-icon"),
+      "name": "link"
+    }, null), this.appDataEntity.logicName, vue.createTextVNode("\u6570\u636E\u5BFC\u5165\u6A21\u677F\u6587\u4EF6")])]), vue.createVNode("div", {
+      "class": this.ns.e("button-bar")
+    }, [vue.createVNode(vue.resolveComponent("el-button"), {
+      "onClick": this.onCancelButtonClick
+    }, {
+      default: () => [vue.createTextVNode("\u53D6\u6D88")]
+    }), this.message.state !== "ready" && vue.createVNode(vue.resolveComponent("el-button"), {
+      "onClick": this.selectFile
+    }, {
+      default: () => [vue.createTextVNode("\u7EE7\u7EED\u5BFC\u5165")]
+    })])]), [[vue.resolveDirective("loading"), this.isLoading]]);
+  }
+});
+
+exports.DataImport = DataImport;

package/lib/common/data-import/data-import.css

@@ -0,0 +1 @@
+.ibiz-data-import{display:flex;flex-flow:column nowrap;width:544px;height:368px;padding:20px;background:var(--ibiz-color-bg-1)}.ibiz-data-import__caption{margin-bottom:16px;font-size:var(--ibiz-font-size-large);font-weight:600;color:var(--ibiz-text-color)}.ibiz-data-import__template-container{padding:16px 12px 0;margin-bottom:16px}.ibiz-data-import__template-link{color:#57a3fd;cursor:pointer}.ibiz-data-import__link-icon{height:19px;margin-right:2px;vertical-align:bottom}.ibiz-data-import__button-bar{margin-right:20px;text-align:right}.ibiz-data-import__button-bar .ivu-btn{margin-left:8px}.ibiz-data-import-upload{display:flex;flex-flow:column nowrap;align-items:center;justify-content:center;flex-grow:1;cursor:pointer;background:var(--ibiz-color-bg-1);border:1px dashed var(--ibiz-color-border);border-radius:4px}.ibiz-data-import-upload__img{width:50px;height:50px;margin-bottom:20px}.ibiz-data-import-message{display:flex;flex-flow:column nowrap;flex-grow:1;padding:8px 16px;overflow:auto;cursor:pointer;background:var(--ibiz-color-bg-1);border:1px dashed var(--ibiz-color-border);border-radius:4px}.ibiz-data-import-message__title{font-size:var(--ibiz-font-size-medium);font-weight:600}.ibiz-data-import-message__content{padding-left:16px}.ibiz-data-import-message__content.is-error{color:var(--ibiz-color-danger)}

package/lib/common/index.cjs

@@ -20,6 +20,7 @@ var extendActionTimeline = require('./extend-action-timeline/extend-action-timel
 var viewMessage = require('./view-message/view-message.cjs');
 var pagination = require('./pagination/pagination.cjs');
 var sortBar = require('./sort-bar/sort-bar.cjs');
+var dataImport = require('./data-import/data-import.cjs');
 var controlLoadingPlaceholder = require('./control-loading-placeholder/control-loading-placeholder.cjs');
 
 "use strict";
@@ -42,6 +43,7 @@ const IBizCommonComponents = {
     v.component(viewMessage.ViewMessage.name, viewMessage.ViewMessage);
     v.component(pagination.IBizPagination.name, pagination.IBizPagination);
     v.component(sortBar.IBizSortBar.name, sortBar.IBizSortBar);
+    v.component(dataImport.DataImport.name, dataImport.DataImport);
     v.component(
       "IBizMapChart",
       vue.defineAsyncComponent({

package/lib/common/map-chart/map-chart.cjs

@@ -22,18 +22,17 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
     options: {
       type: Object,
       default: () => ({})
-    },
-    defaultAreaCode: {
-      type: String,
-      required: true,
-      default: "320000"
     }
   },
   setup(props, {
     emit
   }) {
     const ns = vue3Util.useNamespace("map-chart");
-    const options = vue.computed(() => ramda.mergeDeepRight(mapChart_util.defaultOpts, props.options));
+    const options = vue.computed(() => {
+      return ramda.mergeDeepWithKey((_key, x, z) => {
+        return ramda.isNil(z) ? x : z;
+      }, mapChart_util.defaultOpts, props.options);
+    });
     const findData = (id, type) => {
       if (type === "area" && props.areaData) {
         return props.areaData.find((item) => item._id === id);
@@ -52,7 +51,10 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
     } = mapManager.useMapManager(options, (mapName) => {
       const {
         visualMap,
-        pointSymbol
+        pointSymbol,
+        areaColor,
+        hoverAreaColor,
+        areaBorderColor
       } = options.value;
       const areaData2 = props.areaData || [];
       const pointData2 = props.pointData || [];
@@ -89,9 +91,17 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
             // 地图JSON里和name匹配的属性名称
             nameProperty: "adcodeStr",
             itemStyle: {
-              borderColor: "#FFF",
+              // 默认区域颜色
+              areaColor,
+              borderColor: areaBorderColor,
               borderWidth: 2
             },
+            // 悬浮样式
+            emphasis: {
+              itemStyle: {
+                areaColor: hoverAreaColor
+              }
+            },
             tooltip: {
               formatter: (params) => {
                 if (!params.data) {
@@ -186,7 +196,7 @@ const IBizMapChart = /* @__PURE__ */ vue.defineComponent({
       }
     });
     vue.onMounted(() => {
-      changeMap(props.defaultAreaCode, true);
+      changeMap(options.value.defaultAreaCode, true);
     });
     const {
       areaData,

package/lib/common/map-chart/map-chart.util.cjs

@@ -4,7 +4,7 @@
 const GradientColors = ["#90d1e7", "#fff600", "#ff5200"];
 const defaultOpts = {
   /** true地图code标识使用字符串，false使用数字 */
-  strMapCode: false,
+  strAreaCode: false,
   /** 热力图配置 */
   visualMap: {
     /** 两端的文本，如 ['高', '低'] */
@@ -16,8 +16,18 @@ const defaultOpts = {
     /** 热力图渐变颜色数组 */
     rangeColor: GradientColors
   },
+  /** 区块颜色 */
+  areaColor: "#87cefa",
+  /** 区块边界颜色 */
+  areaBorderColor: "#FFF",
+  /** 悬浮时区块颜色 */
+  hoverAreaColor: "#fbdb2f",
+  /** 点图标 */
   pointSymbol: "pin",
-  jsonBaseUrl: "/assets/json/map/jiangsu"
+  /** 地图json数据基础路径 */
+  jsonBaseUrl: "./assets/json/map",
+  /** 默认打开的区域编码 */
+  defaultAreaCode: 1e5
 };
 
 exports.GradientColors = GradientColors;

package/lib/common/map-chart/map-manager.cjs

@@ -46,14 +46,15 @@ function useMapManager(opts, calcEchartsOpts, emit) {
   const changeMap = async (name, isInit = false) => {
     if (!isInit) {
       emit("mapChange", {
-        areaCode: opts.value.strMapCode ? `${name}` : Number(name)
+        areaCode: opts.value.strAreaCode ? `${name}` : Number(name)
       });
     }
-    if (!mapInfos.has(name)) {
-      await registerMap(name);
+    const strName = `${name}`;
+    if (!mapInfos.has(strName)) {
+      await registerMap(strName);
     }
-    currentName.value = name;
-    historyNames.value.push(name);
+    currentName.value = strName;
+    historyNames.value.push(strName);
     refresh();
   };
   const goBack = () => {
@@ -79,7 +80,6 @@ function useMapManager(opts, calcEchartsOpts, emit) {
             emit("areaClick", params.data);
           }
           if (params.name !== currentName.value) {
-            debugger;
             changeMap(params.name);
           }
         }

package/lib/control/form/form-detail/form-button/form-button.cjs

@@ -47,7 +47,7 @@ const FormButton = /* @__PURE__ */ vue.defineComponent({
       return null;
     }
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.ns.m(this.modelData.codeName), ...this.controller.containerClass]
+      "class": [this.ns.b(), this.ns.m(this.modelData.codeName), this.ns.is("loading", this.controller.state.loading), ...this.controller.containerClass]
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
       "sime": "small",
       "onClick": this.controller.onClick.bind(this.controller),

package/lib/control/form/form-detail/form-button/form-button.css

@@ -1 +1 @@
-.ibiz-form-button{--ibiz-form-button-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-form-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-form-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;height:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-form-button .el-button{width:100%;height:100%}.ibiz-form-button .el-button i,.ibiz-form-button .el-button img{display:inline-block;max-width:var(--ibiz-form-button-icon-max-width);max-height:var(--ibiz-form-button-icon-max-height);margin:var(--ibiz-form-button-icon-margin)}
+.ibiz-form-button{--ibiz-form-button-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-form-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-form-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;height:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-form-button .el-button{width:100%;height:100%}.ibiz-form-button .el-button .ibiz-form-button-content{display:flex;align-items:center;justify-content:flex-start}.ibiz-form-button .el-button .ibiz-form-button-content i,.ibiz-form-button .el-button .ibiz-form-button-content img{display:inline-block;max-width:var(--ibiz-form-button-icon-max-width);max-height:var(--ibiz-form-button-icon-max-height)}.ibiz-form-button .el-button .ibiz-form-button-content .ibiz-icon+.ibiz-form-button-content--caption{margin-left:var(--ibiz-form-button-icon-margin)}.ibiz-form-button.is-loading .el-button .ibiz-icon{display:none}

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-container/form-mdctrl-container.cjs

@@ -51,12 +51,12 @@ const FormMDCtrlContainer = /* @__PURE__ */ vue.defineComponent({
         "class": this.ns.b("title")
       }, [vue.createVNode("span", {
         "class": this.ns.b("caption")
-      }, [this.controller.model.showCaption && this.controller.model.caption]), vue.withDirectives(vue.createVNode(vue.resolveComponent("el-button"), {
+      }, [this.controller.model.showCaption && this.controller.model.caption]), this.buttonVisible && this.controller.isCreate && vue.createVNode(vue.resolveComponent("el-button"), {
         "class": this.ns.b("add-btn"),
         "onClick": () => this.insertButtonClick()
       }, {
         default: () => [vue.createTextVNode("\u6DFB\u52A0")]
-      }), [[vue.vShow, this.buttonVisible]])]), renderFormContent()]]);
+      })]), renderFormContent()]]);
     };
     return vue.createVNode("div", {
       "class": [this.ns.b(), this.ns.b(this.c.model.codeName), this.ns.b(this.c.model.contentType.toLowerCase()), ...this.controller.containerClass, this.ns.is("no-caption", !this.hasCaption)]

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-container/form-mdctrl-container.css

@@ -1 +1 @@
-.ibiz-form-mdctrl{min-height:var(--ibiz-form-mdctrl-min-height);--ibiz-form-mdctrl-gap:var(--ibiz-spacing-tight);--ibiz-form-mdctrl-btn-width:60px;--ibiz-form-mdctrl-min-height:32px;--ibiz-form-mdctrl-content-min-height:72px}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content{display:flex;min-height:var(--ibiz-form-mdctrl-content-min-height);margin-top:var(--ibiz-spacing-tight)}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content-container{width:100%}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content-control{width:calc(100% - var(--ibiz-form-mdctrl-btn-width) - var(--ibiz-form-mdctrl-gap))}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-btn{width:var(--ibiz-form-mdctrl-btn-width);margin-left:var(--ibiz-form-mdctrl-gap);cursor:pointer;display:flex;flex-flow:column nowrap;align-items:center;justify-content:flex-start}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-title{display:flex;align-items:center;justify-content:space-between}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main{position:relative}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main>.ibiz-form-mdctrl-form-content:nth-child(2) .ibiz-form-mdctrl-btn{position:relative;top:40px;height:-moz-fit-content;height:fit-content}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main .ibiz-form-mdctrl-title{position:absolute;top:0;right:0;z-index:2}
+.ibiz-form-mdctrl{min-height:var(--ibiz-form-mdctrl-min-height);--ibiz-form-mdctrl-gap:var(--ibiz-spacing-tight);--ibiz-form-mdctrl-btn-width:60px;--ibiz-form-mdctrl-min-height:32px;--ibiz-form-mdctrl-content-min-height:72px}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content{display:flex;min-height:var(--ibiz-form-mdctrl-content-min-height);margin-top:var(--ibiz-spacing-tight)}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content-container{width:100%}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-form-content-control{width:calc(100% - var(--ibiz-form-mdctrl-btn-width) - var(--ibiz-form-mdctrl-gap))}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-btn{width:var(--ibiz-form-mdctrl-btn-width);margin-left:var(--ibiz-form-mdctrl-gap);display:flex;flex-flow:column nowrap;align-items:center;justify-content:flex-start}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-btn button{cursor:pointer}.ibiz-form-mdctrl .ibiz-form-mdctrl-main .ibiz-form-mdctrl-title{display:flex;align-items:center;justify-content:space-between}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main{position:relative}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main>.ibiz-form-mdctrl-form-content:nth-child(2) .ibiz-form-mdctrl-btn{position:relative;top:40px;height:-moz-fit-content;height:fit-content}.ibiz-form-mdctrl.is-no-caption .ibiz-form-mdctrl-main .ibiz-form-mdctrl-title{position:absolute;top:0;right:0;z-index:2}

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-data-view/form-mdctrl-data-view.cjs

@@ -47,7 +47,7 @@ const FormMDCtrlDataView = /* @__PURE__ */ vue.defineComponent({
           "class": this.ns.b("form-content")
         }, [controlComponent, vue.createVNode("div", {
           "class": this.ns.b("btn")
-        }, [vue.createVNode(vue.resolveComponent("el-button"), {
+        }, [c.parent.isDelete && vue.createVNode(vue.resolveComponent("el-button"), {
           "type": "danger",
           "class": this.ns.b("remove-btn"),
           "disabled": !this.c.state.isSelect,

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.cjs

@@ -54,7 +54,7 @@ const FormMDCtrlForm = /* @__PURE__ */ vue.defineComponent({
             "key": item.srfkey
           }, [controlComponent, vue.createVNode("div", {
             "class": this.ns.b("btn")
-          }, [vue.createVNode(vue.resolveComponent("el-button"), {
+          }, [c.parent.isDelete && vue.createVNode(vue.resolveComponent("el-button"), {
             "type": "danger",
             "class": this.ns.b("remove-btn"),
             "onClick": () => this.c.onDataRemove(index)

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-grid/form-mdctrl-grid.cjs

@@ -49,7 +49,7 @@ const FormMDCtrlGrid = /* @__PURE__ */ vue.defineComponent({
           "class": this.ns.b("form-content")
         }, [controlComponent, vue.createVNode("div", {
           "class": this.ns.b("btn")
-        }, [vue.createVNode(vue.resolveComponent("el-button"), {
+        }, [c.parent.isDelete && vue.createVNode(vue.resolveComponent("el-button"), {
           "type": "danger",
           "class": this.ns.b("remove-btn"),
           "disabled": !this.c.state.isSelect,

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-list/form-mdctrl-list.cjs

@@ -47,7 +47,7 @@ const FormMDCtrlList = /* @__PURE__ */ vue.defineComponent({
           "class": this.ns.b("form-content")
         }, [controlComponent, vue.createVNode("div", {
           "class": this.ns.b("btn")
-        }, [vue.createVNode(vue.resolveComponent("el-button"), {
+        }, [c.parent.isDelete && vue.createVNode(vue.resolveComponent("el-button"), {
           "type": "danger",
           "class": this.ns.b("remove-btn"),
           "disabled": !this.c.state.isSelect,

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-form/form-mdctrl-repeater-form-shell.cjs

@@ -137,7 +137,7 @@ const FormMDCtrlRepeaterFormShell = /* @__PURE__ */ vue.defineComponent({
       "layout": this.c.model.layout
     }, _isSlot(_slot2 = renderDetails(this.data, this.index)) ? _slot2 : {
       default: () => [_slot2]
-    })]), this.buttonVisible && vue.createVNode("div", {
+    })]), this.buttonVisible && this.controller.parent.isDelete && vue.createVNode("div", {
       "class": this.ns.b("btn")
     }, [vue.createVNode(vue.resolveComponent("el-popconfirm"), {
       "title": "\u662F\u5426\u5220\u9664\u8BE5\u9879",

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/form-mdctrl-repeater-grid/form-mdctrl-repeater-grid.cjs

@@ -68,7 +68,7 @@ const FormMDCtrlRepeaterGrid = /* @__PURE__ */ vue.defineComponent({
         "class": this.ns.b("table-left")
       }, [vue.createVNode("span", {
         "class": this.ns.b("table-left-index")
-      }, [index + 1]), vue.createVNode(vue.resolveComponent("el-popconfirm"), {
+      }, [index + 1]), this.controller.parent.isDelete && vue.createVNode(vue.resolveComponent("el-popconfirm"), {
         "title": "\u662F\u5426\u5220\u9664\u9009\u4E2D\u9879",
         "confirm-button-text": "\u786E\u8BA4",
         "cancel-button-text": "\u53D6\u6D88",

package/lib/control/map/map.cjs

@@ -39,12 +39,18 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
     const c = vue3Util.useControlController((...args) => new runtime.MapController(...args));
     const ns = vue3Util.useNamespace(`control-${c.model.controlType.toLowerCase()}`);
     const mapRef = vue.ref();
-    vue.onMounted(() => {
+    const mapOpts = vue.computed(() => {
+      return {
+        strAreaCode: c.state.strAreaCode,
+        defaultAreaCode: c.state.defaultAreaCode,
+        jsonBaseUrl: c.state.jsonBaseUrl
+      };
     });
     return {
       c,
       ns,
-      mapRef
+      mapRef,
+      mapOpts
     };
   },
   render() {
@@ -57,6 +63,7 @@ const MapControl = /* @__PURE__ */ vue.defineComponent({
       default: () => [state.isLoaded && vue.createVNode(vue.resolveComponent("iBizMapChart"), {
         "areaData": state.areaData,
         "pointData": state.pointData,
+        "options": this.mapOpts,
         "class": this.ns.e("map"),
         "onMapChange": (e) => {
           this.c.onMapChange(e.areaCode);

package/lib/control/toolbar/export-excel/export-excel.cjs

@@ -69,60 +69,62 @@ const IBizExportExcel = /* @__PURE__ */ vue.defineComponent({
         });
       },
       dropdown: () => {
-        return [vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-          "command": "maxRowCount"
-        }, {
-          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5168\u90E8(\u6700\u5927\u5BFC\u51FA1000\u884C)")]
-        }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-          "command": "activatedPage"
-        }, {
-          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9875")]
-        }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-          "command": "selectedRows"
-        }, {
-          default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9009\u4E2D")]
-        }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
-          "class": this.ns.e("custom"),
-          "command": ""
-        }, {
-          default: () => [vue.createVNode(vue.resolveComponent("el-input"), {
-            "type": "number",
-            "modelValue": this.startPage,
-            "onUpdate:modelValue": ($event) => this.startPage = $event,
-            "size": "small",
-            "maxlength": "4",
-            "onClick": (event) => {
-              event.stopPropagation();
-            },
-            "onChange": (value) => {
-              this.startPage = value;
-            }
-          }, null), vue.createVNode("span", {
-            "class": "item-text",
-            "onClick": (event) => {
-              event.stopPropagation();
-            }
-          }, [vue.createTextVNode("-")]), vue.createVNode(vue.resolveComponent("el-input"), {
-            "modelValue": this.endPage,
-            "onUpdate:modelValue": ($event) => this.endPage = $event,
-            "size": "small",
-            "type": "number",
-            "maxlength": "4",
-            "onClick": (event) => {
-              event.stopPropagation();
-            }
-          }, null), vue.createVNode("span", {
-            "class": "item-text",
-            "onClick": (event) => {
-              event.stopPropagation();
-            }
-          }, [vue.createTextVNode("\u9875")]), vue.createVNode(vue.resolveComponent("el-button"), {
-            "onClick": (e) => this.onCommand("customPage", e),
-            "size": "small"
+        return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, {
+          default: () => [vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "command": "maxRowCount"
           }, {
-            default: () => [vue.createTextVNode("\u5BFC\u51FA")]
+            default: () => [vue.createTextVNode("\u5BFC\u51FA\u5168\u90E8(\u6700\u5927\u5BFC\u51FA1000\u884C)")]
+          }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "command": "activatedPage"
+          }, {
+            default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9875")]
+          }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "command": "selectedRows"
+          }, {
+            default: () => [vue.createTextVNode("\u5BFC\u51FA\u5F53\u524D\u9009\u4E2D")]
+          }), vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "class": this.ns.e("custom"),
+            "command": ""
+          }, {
+            default: () => [vue.createVNode(vue.resolveComponent("el-input"), {
+              "type": "number",
+              "modelValue": this.startPage,
+              "onUpdate:modelValue": ($event) => this.startPage = $event,
+              "size": "small",
+              "maxlength": "4",
+              "onClick": (event) => {
+                event.stopPropagation();
+              },
+              "onChange": (value) => {
+                this.startPage = value;
+              }
+            }, null), vue.createVNode("span", {
+              "class": "item-text",
+              "onClick": (event) => {
+                event.stopPropagation();
+              }
+            }, [vue.createTextVNode("-")]), vue.createVNode(vue.resolveComponent("el-input"), {
+              "modelValue": this.endPage,
+              "onUpdate:modelValue": ($event) => this.endPage = $event,
+              "size": "small",
+              "type": "number",
+              "maxlength": "4",
+              "onClick": (event) => {
+                event.stopPropagation();
+              }
+            }, null), vue.createVNode("span", {
+              "class": "item-text",
+              "onClick": (event) => {
+                event.stopPropagation();
+              }
+            }, [vue.createTextVNode("\u9875")]), vue.createVNode(vue.resolveComponent("el-button"), {
+              "onClick": (e) => this.onCommand("customPage", e),
+              "size": "small"
+            }, {
+              default: () => [vue.createTextVNode("\u5BFC\u51FA")]
+            })]
           })]
-        })];
+        });
       }
     });
   }

package/lib/control/toolbar/toolbar.cjs

@@ -99,7 +99,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         }
         return vue.createVNode("div", {
           "key": itemId,
-          "class": [ns.e("item"), ns.e("item-deuiaction")]
+          "class": [ns.e("item"), ns.e("item-deuiaction"), ns.is("loading", c.state.buttonsState[itemId].loading)]
         }, [vue.createVNode(vue.resolveComponent("el-button"), {
           "title": item.tooltip,
           "size": btnSize.value,

package/lib/control/toolbar/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-control-toolbar{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2);display:flex}.ibiz-control-toolbar__item{display:flex;align-items:center;margin:var(--ibiz-control-toolbar-item-margin);overflow:hidden}.ibiz-control-toolbar__item .el-button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-control-toolbar-item-padding)}.ibiz-control-toolbar__item .el-button>span{display:flex;align-items:center;justify-content:center;font-size:14px;pointer-events:none}.ibiz-control-toolbar__item .el-button i,.ibiz-control-toolbar__item .el-button img{display:inline-block;max-width:var(--ibiz-control-toolbar-icon-max-width);max-height:var(--ibiz-control-toolbar-icon-max-height);margin:var(--ibiz-control-toolbar-icon-margin)}.ibiz-control-toolbar__item-separator{color:var(--ibiz-control-toolbar-separator-color)}.ibiz-control-toolbar__item-separator+.ibiz-control-toolbar__item-separator,.ibiz-control-toolbar__item-separator:first-child{display:none}
+@charset "UTF-8";.ibiz-control-toolbar{--ibiz-control-toolbar-item-margin:0 var(--ibiz-spacing-extra-tight);--ibiz-control-toolbar-item-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-toolbar-icon-margin:0 var(--ibiz-spacing-extra-tight) 0 0;--ibiz-control-toolbar-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-icon-max-height:var(--ibiz-width-icon-medium);--ibiz-control-toolbar-separator-color:var(--ibiz-color-fill-2);display:flex}.ibiz-control-toolbar__item{display:flex;align-items:center;margin:var(--ibiz-control-toolbar-item-margin);overflow:hidden}.ibiz-control-toolbar__item .el-button{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-control-toolbar-item-padding)}.ibiz-control-toolbar__item .el-button>span{display:flex;align-items:center;justify-content:center;font-size:14px;pointer-events:none}.ibiz-control-toolbar__item .el-button i,.ibiz-control-toolbar__item .el-button img{display:inline-block;max-width:var(--ibiz-control-toolbar-icon-max-width);max-height:var(--ibiz-control-toolbar-icon-max-height);margin:var(--ibiz-control-toolbar-icon-margin)}.ibiz-control-toolbar__item.is-loading .el-button .ibiz-icon{display:none}.ibiz-control-toolbar__item-separator{color:var(--ibiz-control-toolbar-separator-color)}.ibiz-control-toolbar__item-separator+.ibiz-control-toolbar__item-separator,.ibiz-control-toolbar__item-separator:first-child{display:none}

package/lib/editor/autocomplete/autocomplete-editor.controller.cjs

@@ -2,6 +2,7 @@
 
 var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
+var ramda = require('ramda');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -89,20 +90,22 @@ class AutoCompleteEditorController extends runtime.EditorController {
       this.context,
       this.params
     );
+    const fixedParams = {};
     if (this.sort && !Object.is(this.sort, "")) {
-      Object.assign(params, { sort: this.sort });
+      Object.assign(fixedParams, { sort: this.sort });
     }
     if (query) {
-      Object.assign(params, { query });
+      Object.assign(fixedParams, { query });
     }
-    Object.assign(params, { size: 1e3 });
+    Object.assign(fixedParams, { size: 1e3 });
+    const tempParams = ramda.mergeDeepLeft(params, fixedParams);
     if (this.interfaceName) {
       const app = ibiz.hub.getApp(this.context.srfappid);
       const res = await app.deService.exec(
         this.model.appDataEntityId,
         this.interfaceName,
         context,
-        params
+        tempParams
       );
       return res;
     }

package/lib/editor/data-picker/picker-editor.controller.cjs

@@ -164,25 +164,27 @@ class PickerEditorController extends runtime.EditorController {
    * @memberof PickerEditorController
    */
   async getServiceData(query, data) {
-    const tempParams = { ...this.params, size: 1e3 };
-    if (query) {
-      Object.assign(tempParams, { query });
-    }
-    if (this.sort && !Object.is(this.sort, "")) {
-      Object.assign(tempParams, { sort: this.sort });
-    }
     const { context, params } = this.handlePublicParams(
       data,
       this.context,
-      tempParams
+      this.params
     );
+    const fixedParams = {};
+    if (this.sort && !Object.is(this.sort, "")) {
+      Object.assign(fixedParams, { sort: this.sort });
+    }
+    if (query) {
+      Object.assign(fixedParams, { query });
+    }
+    Object.assign(fixedParams, { size: 1e3 });
+    const tempParams = ramda.mergeDeepLeft(params, fixedParams);
     if (this.interfaceName) {
       const app = ibiz.hub.getApp(this.context.srfappid);
       const res = await app.deService.exec(
         this.model.appDataEntityId,
         this.interfaceName,
         context,
-        params
+        tempParams
       );
       return res;
     }