@ecan-bi/datav 1.0.99 → 1.1.1

package/dist/index.es.js

@@ -1,6 +1,6 @@
-/*! @ecan-bi/datav@1.0.99 */
+/*! @ecan-bi/datav@1.1.1 */
 var _a, _b, _c, _d;
-import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
+import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, onBeforeUnmount, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
 import { addListener, removeListener } from "resize-detector";
 import { Spin as Spin$1, Skeleton as Skeleton$1, message, Progress, Input as Input$1, DatePicker as DatePicker$1, Select as Select$1, RangePicker as RangePicker$1, Button as Button$1, CheckboxGroup, Modal as Modal$1, Table as Table$1, TableSummary, TableSummaryRow, TableSummaryCell } from "ant-design-vue";
@@ -1560,13 +1560,11 @@ const BASE_URL = ((_c = window == null ? void 0 : window.config) == null ? void
 const ERD_URL = ((_d = window == null ? void 0 : window.config) == null ? void 0 : _d.erdURL) || "";
 const useOnEvent = (props2, events) => {
   watch(() => props2.id, (id, oldId) => {
+    console.log(id, oldId);
     const eventBus = 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);
     }
@@ -2640,11 +2638,16 @@ const _sfc_main$o = defineComponent({
       setGlobalModel
     });
     const eventBus = mitt();
+    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]();
       });
-      onUnmounted(() => {
+      onBeforeUnmount(() => {
         eventBus.off(key);
       });
     };
@@ -2667,14 +2670,16 @@ const _sfc_main$o = defineComponent({
       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) => {
@@ -2696,22 +2701,29 @@ const _sfc_main$o = defineComponent({
       });
       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" && 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" && 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();
       }
     };
     provide(REQUEST_MODEL, {
@@ -2730,6 +2742,10 @@ const _sfc_main$o = defineComponent({
         eventBus.off(REFRESH_PAGE);
       });
     };
+    onBeforeUnmount(() => {
+      requestModel == null ? void 0 : requestModel.clear();
+      requestMap == null ? void 0 : requestMap.clear();
+    });
     expose({
       touchRequest,
       getGlobalModel,
@@ -2864,9 +2880,13 @@ const _sfc_main$n = defineComponent({
       refreshData
     });
     const { setRequest } = 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
     });
@@ -2899,7 +2919,7 @@ const _sfc_main$n = defineComponent({
     };
   }
 });
-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 = resolveComponent("skeleton");
@@ -2917,7 +2937,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     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 = defineComponent({
   name: "EcanScrollText",
@@ -3101,9 +3121,13 @@ const _sfc_main$k = defineComponent({
       refreshData
     });
     const { setRequest } = 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,
@@ -3115,9 +3139,9 @@ const _sfc_main$k = defineComponent({
     };
   }
 });
-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) => (pushScopeId("data-v-73ca0d93"), n = n(), popScopeId(), n);
+const _withScopeId$1 = (n) => (pushScopeId("data-v-baf2ff0c"), n = n(), popScopeId(), n);
 const _hoisted_1$6 = {
   key: 0,
   class: "title"
@@ -3219,7 +3243,7 @@ function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
     }, 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,
@@ -3374,9 +3398,13 @@ const _sfc_main$j = defineComponent({
     const click = emitEvent("click", () => {
     });
     const { setRequest } = 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,
@@ -3387,7 +3415,7 @@ const _sfc_main$j = defineComponent({
     };
   }
 });
-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 = resolveComponent("skeleton");
   const _component_a_progress = resolveComponent("a-progress");
@@ -3427,7 +3455,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     }, 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,
@@ -3674,9 +3702,13 @@ const _sfc_main$g = defineComponent({
       selectChange
     });
     const { setRequest } = 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,
@@ -3688,7 +3720,7 @@ const _sfc_main$g = defineComponent({
     };
   }
 });
-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 = resolveComponent("a-select");
@@ -3712,7 +3744,7 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
     }, 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,
@@ -3966,9 +3998,13 @@ const _sfc_main$d = defineComponent({
       setGlobalModel(id, { ...modal, RECORD: myValue });
     });
     const { setRequest } = 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,
@@ -4315,9 +4351,13 @@ const _sfc_main$c = defineComponent({
       click
     });
     const { setRequest } = 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,
@@ -4725,9 +4765,13 @@ const _sfc_main$b = defineComponent({
       click
     });
     const { setRequest } = 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,
@@ -5170,9 +5214,13 @@ const _sfc_main$a = defineComponent({
       setGlobalModel(id, { ...modal, RECORD: e.data });
     });
     const { setRequest } = 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
@@ -5494,9 +5542,13 @@ const _sfc_main$9 = defineComponent({
       click
     });
     const { setRequest } = 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,
@@ -6021,9 +6073,13 @@ const _sfc_main$7 = defineComponent({
       setGlobalModel(id, { ...modal, RECORD: e == null ? void 0 : e.data });
     });
     const { setRequest } = 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
@@ -6759,7 +6815,7 @@ const _sfc_main$1 = defineComponent({
     const pageNum = ref(1);
     const pageSize = 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++) {
@@ -6771,9 +6827,11 @@ const _sfc_main$1 = defineComponent({
           }
           const {
             cellAlign = "center",
-            cellColor
+            cellColor,
+            dataIndex,
+            title
           } = column;
-          column.customCell = (_record, rowIndex) => ({
+          column.customCell = (record, rowIndex) => ({
             style: {
               textAlign: cellAlign,
               color: cellColor,
@@ -6782,7 +6840,17 @@ const _sfc_main$1 = defineComponent({
             },
             class: {
               highlight: 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);
@@ -6869,8 +6937,8 @@ const _sfc_main$1 = defineComponent({
         tableColumns.value = columns;
         tableDataSource.value = dataSource;
       } else {
-        tableColumns.value = unref(myColumns);
-        tableDataSource.value = unref(myDataSource);
+        tableColumns.value = cloneDeep(unref(myColumns));
+        tableDataSource.value = cloneDeep(unref(myDataSource));
       }
     }, {
       deep: true,
@@ -6885,7 +6953,7 @@ const _sfc_main$1 = defineComponent({
         if (isUseLoading)
           loading.value = true;
         let params = {};
-        if (unref(orderCondition) != null) {
+        if (unref(orderCondition)) {
           params.orderCondition = unref(orderCondition);
         }
         if (props2.paginationShow) {
@@ -6899,7 +6967,9 @@ const _sfc_main$1 = defineComponent({
         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 {
@@ -6992,7 +7062,7 @@ const _sfc_main$1 = defineComponent({
     };
     const useRowIndex = 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 });
@@ -7015,8 +7085,12 @@ const _sfc_main$1 = defineComponent({
       refreshData
     });
     const summaryList = computed(() => {
-      const columns = props2.columns;
-      const summaryList2 = props2.isUseSeq ? [{ total: "\u5C0F\u8BA1" }] : [];
+      const columns = 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];
@@ -7038,24 +7112,32 @@ const _sfc_main$1 = defineComponent({
         return [];
       const start = (unref(pageNum) - 1) * unref(pageSize);
       const end = start + unref(pageSize);
-      const records = 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 = 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 } = 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
     });
@@ -7101,7 +7183,7 @@ const _sfc_main$1 = defineComponent({
     };
   }
 });
-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,
@@ -7188,8 +7270,8 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                   default: withCtx(() => [
                     (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.summaryList, (summary, index2) => {
                       return openBlock(), createBlock(_component_a_table_summary_cell, {
-                        key: summary.dataIndex + index2,
-                        index: summary.index,
+                        key: index2,
+                        index: index2,
                         style: normalizeStyle({
                           backgroundColor: _ctx.cellBackgroundColor,
                           textAlign: summary.cellAlign || "center",
@@ -7199,8 +7281,12 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                       }, {
                         default: withCtx(() => [
                           createElementVNode("div", {
-                            class: normalizeClass([_ctx.contrastClass(summary.total, summary.format)])
-                          }, toDisplayString((summary.format != null || summary.format !== "") && _ctx.formatFn(summary.total, summary.format)), 3)
+                            class: normalizeClass([_ctx.contrastClass(summary.total, summary.format)]),
+                            style: normalizeStyle({
+                              fontSize: _ctx.fontSize,
+                              fontWeight: _ctx.fontWeight
+                            })
+                          }, toDisplayString((summary.format != null || summary.format !== "") && _ctx.formatFn(summary.total, summary.format)), 7)
                         ]),
                         _: 2
                       }, 1032, ["index", "style"]);
@@ -7219,7 +7305,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     }, 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,