@ecan-bi/datav 1.0.99 → 1.1.1

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.99 */
+/*! @ecan-bi/datav@1.1.1 */
 (function(global, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue"), require("echarts/core"), require("resize-detector"), require("ant-design-vue"), require("ant-design-vue/es/spin/style"), require("ant-design-vue/es/skeleton/style"), require("lodash-es"), require("axios"), require("mitt"), require("dayjs"), require("ant-design-vue/es/progress/style"), require("ant-design-vue/es/input/style"), require("ant-design-vue/es/date-picker/style"), require("ant-design-vue/es/date-picker/locale/zh_CN"), require("ant-design-vue/es/select/style"), require("ant-design-vue/es/button/style"), require("ant-design-vue/es/checkbox/style"), require("echarts/renderers"), require("echarts/charts"), require("echarts/components"), require("echarts"), require("ant-design-vue/es/modal/style"), require("ant-design-vue/es/table/style")) : typeof define === "function" && define.amd ? define(["exports", "vue", "echarts/core", "resize-detector", "ant-design-vue", "ant-design-vue/es/spin/style", "ant-design-vue/es/skeleton/style", "lodash-es", "axios", "mitt", "dayjs", "ant-design-vue/es/progress/style", "ant-design-vue/es/input/style", "ant-design-vue/es/date-picker/style", "ant-design-vue/es/date-picker/locale/zh_CN", "ant-design-vue/es/select/style", "ant-design-vue/es/button/style", "ant-design-vue/es/checkbox/style", "echarts/renderers", "echarts/charts", "echarts/components", "echarts", "ant-design-vue/es/modal/style", "ant-design-vue/es/table/style"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@ecan/bi-datav"] = {}, global.vue, global["echarts/core"], global["resize-detector"], global["ant-design-vue"], null, null, global["lodash-es"], global.axios, global.mitt, global.dayjs, null, null, null, global["ant-design-vue/es/date-picker/locale/zh_CN"], null, null, null, global["echarts/renderers"], global["echarts/charts"], global["echarts/components"], global.echarts));
 })(this, function(exports2, vue, core, resizeDetector, antDesignVue, style$1, style$2, lodashEs, axios, mitt, dayjs, style$3, style$4, style$5, locale, style$6, style$7, style$8, renderers, charts, components$1, echarts) {
@@ -1565,13 +1565,11 @@
   const ERD_URL = ((_d = window == null ? void 0 : window.config) == null ? void 0 : _d.erdURL) || "";
   const useOnEvent = (props2, events) => {
     vue.watch(() => props2.id, (id, oldId) => {
+      console.log(id, oldId);
       const eventBus = vue.inject(EVENT_BUS, {
         onEvent: (i, e) => void 0,
         offEvent: (i) => void 0
       });
-      if (oldId != null && oldId !== "") {
-        eventBus.offEvent(oldId);
-      }
       if (id != null && id !== "") {
         eventBus.onEvent(id, events);
       }
@@ -2645,11 +2643,16 @@
         setGlobalModel
       });
       const eventBus = mitt__default.default();
+      const eventBusKeySet = /* @__PURE__ */ new Set();
       const onEvent = (key, events) => {
+        if (eventBusKeySet.has(key)) {
+          eventBus.off(key);
+        }
         eventBus.on(key, (k) => {
+          eventBusKeySet.add(key);
           return Object.prototype.toString.call(events[k]) === "[object Function]" && events[k]();
         });
-        vue.onUnmounted(() => {
+        vue.onBeforeUnmount(() => {
           eventBus.off(key);
         });
       };
@@ -2672,14 +2675,16 @@
         requestToken
       });
       const requestModel = /* @__PURE__ */ new Map();
-      const setRequest = (requestFn = () => {
-      }, sortNum = 0) => {
+      const requestMap = /* @__PURE__ */ new Map();
+      const setRequest = ({ requestFn = () => {
+      }, sortNum = 0, id = "" }) => {
         if (requestModel.has(sortNum)) {
           const requestFnList = requestModel.get(sortNum);
           requestFnList == null ? void 0 : requestFnList.push(requestFn);
         } else {
           requestModel.set(sortNum, [requestFn]);
         }
+        requestMap.set(id, requestFn);
       };
       const handleRequestFnList = (requestFnList) => {
         return new Promise((resolve, reject) => {
@@ -2701,22 +2706,29 @@
         });
         config.indicatorToken = (_a2 = res.data.data) == null ? void 0 : _a2.token;
       };
-      const touchRequest = async () => {
-        const requestModelArr = Array.from(requestModel);
-        requestModelArr.sort((a, b) => b[0] - a[0]);
-        const len = requestModelArr.length;
-        try {
-          if (props2.pageMode !== "design" && vue.unref(tokenNum) > 0) {
-            await queryUserToken();
+      const touchRequest = async (id) => {
+        if (!id) {
+          const requestModelArr = Array.from(requestModel);
+          requestModelArr.sort((a, b) => b[0] - a[0]);
+          const len = requestModelArr.length;
+          try {
+            if (props2.pageMode !== "design" && vue.unref(tokenNum) > 0) {
+              await queryUserToken();
+            }
+            for (let i = 0; i < len; i++) {
+              const requestFnList = requestModelArr[i][1];
+              await handleRequestFnList(requestFnList);
+            }
+          } catch (e) {
+            console.error(e);
+          } finally {
+            requestModel.clear();
           }
-          for (let i = 0; i < len; i++) {
-            const requestFnList = requestModelArr[i][1];
-            await handleRequestFnList(requestFnList);
+        } else if (typeof id === "string") {
+          const requestFn = requestMap.get(id);
+          if (typeof requestFn === "function") {
+            requestFn();
           }
-        } catch (e) {
-          console.error(e);
-        } finally {
-          requestModel.clear();
         }
       };
       vue.provide(REQUEST_MODEL, {
@@ -2735,6 +2747,10 @@
           eventBus.off(REFRESH_PAGE);
         });
       };
+      vue.onBeforeUnmount(() => {
+        requestModel == null ? void 0 : requestModel.clear();
+        requestMap == null ? void 0 : requestMap.clear();
+      });
       expose({
         touchRequest,
         getGlobalModel,
@@ -2869,9 +2885,13 @@
         refreshData
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: refreshData,
+        sortNum: props2.requestSort
       });
-      setRequest(refreshData, props2.requestSort);
       useOnEvent(props2, {
         refreshData
       });
@@ -2904,7 +2924,7 @@
       };
     }
   });
-  const Text_vue_vue_type_style_index_0_scoped_8e727e41_lang = "";
+  const Text_vue_vue_type_style_index_0_scoped_860fa6ea_lang = "";
   const _hoisted_1$8 = ["innerHTML"];
   function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_skeleton = vue.resolveComponent("skeleton");
@@ -2922,7 +2942,7 @@
       onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
     }, null, 12, _hoisted_1$8));
   }
-  const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-8e727e41"]]);
+  const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-860fa6ea"]]);
   const EcanText = withInstall(Text);
   const _sfc_main$m = vue.defineComponent({
     name: "EcanScrollText",
@@ -3106,9 +3126,13 @@
         refreshData
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: handleRequestData,
+        sortNum: props2.requestSort
       });
-      setRequest(handleRequestData, props2.requestSort);
       return {
         style: style2,
         formatFn,
@@ -3120,9 +3144,9 @@
       };
     }
   });
-  const List_vue_vue_type_style_index_0_scoped_73ca0d93_lang = "";
+  const List_vue_vue_type_style_index_0_scoped_baf2ff0c_lang = "";
   const List_vue_vue_type_style_index_1_lang = "";
-  const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-73ca0d93"), n = n(), vue.popScopeId(), n);
+  const _withScopeId$1 = (n) => (vue.pushScopeId("data-v-baf2ff0c"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$6 = {
     key: 0,
     class: "title"
@@ -3224,7 +3248,7 @@
       }, 8, ["loading"])
     ], 4);
   }
-  const List = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$k], ["__scopeId", "data-v-73ca0d93"]]);
+  const List = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["render", _sfc_render$k], ["__scopeId", "data-v-baf2ff0c"]]);
   const EcanList = withInstall(List);
   const proportionProps = {
     ...props,
@@ -3379,9 +3403,13 @@
       const click = emitEvent("click", () => {
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: handleRequestData,
+        sortNum: props2.requestSort
       });
-      setRequest(handleRequestData, props2.requestSort);
       return {
         style: style2,
         myWidth,
@@ -3392,7 +3420,7 @@
       };
     }
   });
-  const Proportion_vue_vue_type_style_index_0_scoped_c6114322_lang = "";
+  const Proportion_vue_vue_type_style_index_0_scoped_304d430d_lang = "";
   function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_skeleton = vue.resolveComponent("skeleton");
     const _component_a_progress = vue.resolveComponent("a-progress");
@@ -3432,7 +3460,7 @@
       }, 8, ["percent", "width", "type", "strokeColor", "strokeLinecap", "trailColor", "strokeWidth", "gapDegree", "onClick"])
     ], 4);
   }
-  const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-c6114322"]]);
+  const Proportion = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-304d430d"]]);
   const EcanProportion = withInstall(Proportion);
   const inputProps = {
     ...props,
@@ -3679,9 +3707,13 @@
         selectChange
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: handleRequestData,
+        sortNum: props2.requestSort
       });
-      setRequest(handleRequestData, props2.requestSort);
       return {
         style: style2,
         getPopupContainer,
@@ -3693,7 +3725,7 @@
       };
     }
   });
-  const Select_vue_vue_type_style_index_0_scoped_3e94d5e8_lang = "";
+  const Select_vue_vue_type_style_index_0_scoped_dd2bcf63_lang = "";
   const Select_vue_vue_type_style_index_1_lang = "";
   function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_a_select = vue.resolveComponent("a-select");
@@ -3717,7 +3749,7 @@
       }, null, 8, ["value", "options", "mode", "getPopupContainer", "field-names", "maxTagCount", "filter-option", "onChange", "loading"])
     ], 4);
   }
-  const Select = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-3e94d5e8"]]);
+  const Select = /* @__PURE__ */ _export_sfc(_sfc_main$g, [["render", _sfc_render$g], ["__scopeId", "data-v-dd2bcf63"]]);
   const EcanSelect = withInstall(Select);
   const rangePickerProps = {
     ...props,
@@ -3971,9 +4003,13 @@
         setGlobalModel(id, { ...modal, RECORD: myValue });
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id: id2, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: handleRequestData,
+        sortNum: props2.requestSort
       });
-      setRequest(handleRequestData, props2.requestSort);
       return {
         myOption,
         style: style2,
@@ -4320,9 +4356,13 @@
         click
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: chooseRequestOrDiagram,
+        sortNum: props2.requestSort
       });
-      setRequest(chooseRequestOrDiagram, props2.requestSort);
       return {
         option,
         style: style2,
@@ -4730,9 +4770,13 @@
         click
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: chooseRequestOrDiagram,
+        sortNum: props2.requestSort
       });
-      setRequest(chooseRequestOrDiagram, props2.requestSort);
       return {
         option,
         style: style2,
@@ -5175,9 +5219,13 @@
         setGlobalModel(id, { ...modal, RECORD: e.data });
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: refreshData,
+        sortNum: props2.requestSort
       });
-      setRequest(refreshData, props2.requestSort);
       useOnEvent(props2, {
         refreshData,
         click
@@ -5499,9 +5547,13 @@
         click
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: handleRequestData,
+        sortNum: props2.requestSort
       });
-      setRequest(handleRequestData, props2.requestSort);
       return {
         option,
         style: style2,
@@ -6026,9 +6078,13 @@
         setGlobalModel(id, { ...modal, RECORD: e == null ? void 0 : e.data });
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: chooseRequestOrDiagram,
+        sortNum: props2.requestSort
       });
-      setRequest(chooseRequestOrDiagram, props2.requestSort);
       useOnEvent(props2, {
         refreshData,
         click
@@ -6764,7 +6820,7 @@
       const pageNum = vue.ref(1);
       const pageSize = vue.computed(() => props2.paginationPageSize);
       const handleChildrenColumns = (_columns) => {
-        if (Array.isArray(_columns)) {
+        if (Array.isArray(_columns) && _columns.length > 0) {
           const len = _columns.length;
           const columnsFixedNum = props2.columnsFixedNum;
           for (let i = 0; i < len; i++) {
@@ -6776,9 +6832,11 @@
             }
             const {
               cellAlign = "center",
-              cellColor
+              cellColor,
+              dataIndex,
+              title
             } = column;
-            column.customCell = (_record, rowIndex) => ({
+            column.customCell = (record, rowIndex) => ({
               style: {
                 textAlign: cellAlign,
                 color: cellColor,
@@ -6787,7 +6845,17 @@
               },
               class: {
                 highlight: vue.unref(useRowIndex) === rowIndex && props2.clickHighlight
-              }
+              },
+              onClick: emitEvent("click", () => {
+                const id = props2.id;
+                const modal = getGlobalModel(id);
+                record = {
+                  dataIndex,
+                  title,
+                  ...record
+                };
+                setGlobalModel(id, { ...modal, RECORD: record });
+              })
             });
             if (Array.isArray(column.children)) {
               handleChildrenColumns(column.children);
@@ -6874,8 +6942,8 @@
           tableColumns.value = columns;
           tableDataSource.value = dataSource;
         } else {
-          tableColumns.value = vue.unref(myColumns);
-          tableDataSource.value = vue.unref(myDataSource);
+          tableColumns.value = lodashEs.cloneDeep(vue.unref(myColumns));
+          tableDataSource.value = lodashEs.cloneDeep(vue.unref(myDataSource));
         }
       }, {
         deep: true,
@@ -6890,7 +6958,7 @@
           if (isUseLoading)
             loading.value = true;
           let params = {};
-          if (vue.unref(orderCondition) != null) {
+          if (vue.unref(orderCondition)) {
             params.orderCondition = vue.unref(orderCondition);
           }
           if (props2.paginationShow) {
@@ -6904,7 +6972,9 @@
           const res = await requestData(params);
           const { rows = [], total: tableTotal = 0 } = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.data) || {};
           total.value = tableTotal;
-          myDataSource.value = rows;
+          if (Array.isArray(rows)) {
+            myDataSource.value = rows;
+          }
         } catch (e) {
           console.error(e);
         } finally {
@@ -6997,7 +7067,7 @@
       };
       const useRowIndex = vue.ref(-1);
       const customRow = (record, index2) => ({
-        onClick: emitEvent("click", () => {
+        onClick: emitEvent("rowClick", () => {
           const id = props2.id;
           const modal = getGlobalModel(id);
           setGlobalModel(id, { ...modal, RECORD: record });
@@ -7020,8 +7090,12 @@
         refreshData
       });
       const summaryList = vue.computed(() => {
-        const columns = props2.columns;
-        const summaryList2 = props2.isUseSeq ? [{ total: "\u5C0F\u8BA1" }] : [];
+        const columns = vue.unref(tableColumns);
+        let summaryList2 = [];
+        if (props2.isUseSeq) {
+          columns.shift();
+          summaryList2 = [{ total: "\u5C0F\u8BA1" }];
+        }
         let calcTotalCount = 0;
         for (let i = 0; i < columns.length; i++) {
           const column = columns[i];
@@ -7043,24 +7117,32 @@
           return [];
         const start = (vue.unref(pageNum) - 1) * vue.unref(pageSize);
         const end = start + vue.unref(pageSize);
-        const records = vue.unref(myDataSource).slice(start, end);
-        for (let i = 0; i < records.length; i++) {
-          const record = records[i];
-          for (let j = 0; j < summaryList2.length; j++) {
-            const summary = summaryList2[j];
-            const { dataIndex, total: total2 } = summary;
-            const num = +record[dataIndex];
-            if (!Number.isNaN(num) && total2 != null) {
-              summary.total = num + total2;
+        const records = vue.unref(tableDataSource).slice(start, end);
+        for (let i = 0; i < summaryList2.length; i++) {
+          const summary = summaryList2[i];
+          let total2 = 0;
+          const { isCalcTotal, dataIndex } = summary;
+          if (isCalcTotal === true) {
+            for (let j = 0; j < records.length; j++) {
+              const record = records[j];
+              const num = record[dataIndex];
+              if (!isNaN(num)) {
+                total2 = num + total2;
+              }
             }
+            summary.total = total2;
           }
         }
         return summaryList2;
       });
       const { setRequest } = vue.inject(REQUEST_MODEL, {
-        setRequest: (requestFn, sortNum) => void 0
+        setRequest: ({ id, sortNum, requestFn }) => void 0
+      });
+      setRequest({
+        id: props2.id,
+        requestFn: refreshData,
+        sortNum: props2.requestSort
       });
-      setRequest(refreshData, props2.requestSort);
       expose({
         refreshData
       });
@@ -7106,7 +7188,7 @@
       };
     }
   });
-  const Table_vue_vue_type_style_index_0_scoped_7b4da072_lang = "";
+  const Table_vue_vue_type_style_index_0_scoped_3e5c9238_lang = "";
   const Table_vue_vue_type_style_index_1_lang = "";
   const _hoisted_1$1 = {
     key: 1,
@@ -7193,8 +7275,8 @@
                     default: vue.withCtx(() => [
                       (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.summaryList, (summary, index2) => {
                         return vue.openBlock(), vue.createBlock(_component_a_table_summary_cell, {
-                          key: summary.dataIndex + index2,
-                          index: summary.index,
+                          key: index2,
+                          index: index2,
                           style: vue.normalizeStyle({
                             backgroundColor: _ctx.cellBackgroundColor,
                             textAlign: summary.cellAlign || "center",
@@ -7204,8 +7286,12 @@
                         }, {
                           default: vue.withCtx(() => [
                             vue.createElementVNode("div", {
-                              class: vue.normalizeClass([_ctx.contrastClass(summary.total, summary.format)])
-                            }, vue.toDisplayString((summary.format != null || summary.format !== "") && _ctx.formatFn(summary.total, summary.format)), 3)
+                              class: vue.normalizeClass([_ctx.contrastClass(summary.total, summary.format)]),
+                              style: vue.normalizeStyle({
+                                fontSize: _ctx.fontSize,
+                                fontWeight: _ctx.fontWeight
+                              })
+                            }, vue.toDisplayString((summary.format != null || summary.format !== "") && _ctx.formatFn(summary.total, summary.format)), 7)
                           ]),
                           _: 2
                         }, 1032, ["index", "style"]);
@@ -7224,7 +7310,7 @@
       }, 8, ["loading"])
     ], 4);
   }
-  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-7b4da072"]]);
+  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-3e5c9238"]]);
   const EcanTable = withInstall(Table);
   const mapProps = {
     ...props,