@ecan-bi/datav 1.0.98 → 1.1.0

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.98 */
+/*! @ecan-bi/datav@1.1.0 */
 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 { throttle, init, use, registerMap } from "echarts/core";
@@ -1751,7 +1751,7 @@ const useRequestData = (props2, callBack = () => {
         _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;
@@ -6759,7 +6759,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++) {
@@ -6869,14 +6869,14 @@ 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,
       immediate: true
     });
-    const orderCondition = ref(void 0);
+    const orderCondition = ref("");
     const requestData = useRequestData(props2);
     const loading = ref(false);
     const handleRequestData = async (isUseLoading = true) => {
@@ -6884,9 +6884,10 @@ const _sfc_main$1 = defineComponent({
       try {
         if (isUseLoading)
           loading.value = true;
-        let params = {
-          orderCondition: unref(orderCondition)
-        };
+        let params = {};
+        if (unref(orderCondition)) {
+          params.orderCondition = unref(orderCondition);
+        }
         if (props2.paginationShow) {
           params = {
             pageNum: unref(pageNum),
@@ -6898,7 +6899,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 {
@@ -7014,8 +7017,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];
@@ -7037,16 +7044,20 @@ 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;
@@ -7100,7 +7111,7 @@ const _sfc_main$1 = defineComponent({
     };
   }
 });
-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,
@@ -7187,8 +7198,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",
@@ -7198,8 +7209,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"]);
@@ -7218,7 +7233,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-9d631b38"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-33b428a2"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,