@ecan-bi/datav 1.0.98 → 1.1.0

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.98 */
+/*! @ecan-bi/datav@1.1.0 */
 (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) {
@@ -1756,7 +1756,7 @@
           _params[key] = useVariablesInText(value);
         }
       });
-      _params = { ...window.config.requestParams, ..._params, ...params };
+      _params = { ...window.config.requestParams, ...params, ..._params };
       let urlParams = "";
       const keys = Object.keys(_params);
       const last = keys.length - 1;
@@ -6764,7 +6764,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++) {
@@ -6874,14 +6874,14 @@
           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,
         immediate: true
       });
-      const orderCondition = vue.ref(void 0);
+      const orderCondition = vue.ref("");
       const requestData = useRequestData(props2);
       const loading = vue.ref(false);
       const handleRequestData = async (isUseLoading = true) => {
@@ -6889,9 +6889,10 @@
         try {
           if (isUseLoading)
             loading.value = true;
-          let params = {
-            orderCondition: vue.unref(orderCondition)
-          };
+          let params = {};
+          if (vue.unref(orderCondition)) {
+            params.orderCondition = vue.unref(orderCondition);
+          }
           if (props2.paginationShow) {
             params = {
               pageNum: vue.unref(pageNum),
@@ -6903,7 +6904,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 {
@@ -7019,8 +7022,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];
@@ -7042,16 +7049,20 @@
           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;
@@ -7105,7 +7116,7 @@
       };
     }
   });
-  const Table_vue_vue_type_style_index_0_scoped_9d631b38_lang = "";
+  const Table_vue_vue_type_style_index_0_scoped_33b428a2_lang = "";
   const Table_vue_vue_type_style_index_1_lang = "";
   const _hoisted_1$1 = {
     key: 1,
@@ -7192,8 +7203,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",
@@ -7203,8 +7214,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"]);
@@ -7223,7 +7238,7 @@
       }, 8, ["loading"])
     ], 4);
   }
-  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-9d631b38"]]);
+  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-33b428a2"]]);
   const EcanTable = withInstall(Table);
   const mapProps = {
     ...props,