@ecan-bi/datav 1.1.1 → 1.1.2

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.1 */
+/*! @ecan-bi/datav@1.1.2 */
 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, onBeforeUnmount, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1560,7 +1560,6 @@ 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
@@ -1677,8 +1676,6 @@ const useVariablesInText = (formatter = "", data = {}, { useNewline = false, use
       const usedVariable = data[textVariable];
       if (usedVariable != null) {
         statement = statement.replace(textVariable, usedVariable);
-      } else {
-        statement = statement.replace(textVariable, "");
       }
     }
     try {
@@ -3150,7 +3147,7 @@ const _hoisted_2$2 = {
   key: 0,
   class: "ranking"
 };
-const _hoisted_3$1 = {
+const _hoisted_3$2 = {
   key: 1,
   class: "ecan-list-content"
 };
@@ -3198,7 +3195,7 @@ function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
             ], 4);
           }), 128))
         ])) : createCommentVNode("", true),
-        _ctx.dataSource.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$1, [
+        _ctx.dataSource.length > 0 ? (openBlock(), createElementBlock("div", _hoisted_3$2, [
           _ctx.useTitle ? (openBlock(), createElementBlock("div", {
             key: 0,
             class: "title-placeholder",
@@ -6213,7 +6210,7 @@ const Border_vue_vue_type_style_index_0_scoped_f3fc1305_lang = "";
 const _withScopeId = (n) => (pushScopeId("data-v-f3fc1305"), n = n(), popScopeId(), n);
 const _hoisted_1$5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "top-left border-item" }, null, -1));
 const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "top-right border-item" }, null, -1));
-const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
+const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
 const _hoisted_4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-right border-item" }, null, -1));
 const _hoisted_5 = { class: "title-item-wrapper" };
 const _hoisted_6 = { class: "title-item" };
@@ -6249,7 +6246,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
       _ctx.useBorderModify ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
         _hoisted_1$5,
         _hoisted_2$1,
-        _hoisted_3,
+        _hoisted_3$1,
         _hoisted_4
       ], 64)) : createCommentVNode("", true)
     ], 4)) : createCommentVNode("", true),
@@ -6808,13 +6805,13 @@ const _sfc_main$1 = defineComponent({
     const x = computed(() => props2.scrollX);
     const y = computed(() => parseFloat(props2.height) - unref(splitY));
     const myColumns = ref([]);
-    const myDataSource = ref(props2.data);
+    const myDataSource = ref([]);
     const tableColumns = ref([]);
     const tableDataSource = ref([]);
     const total = ref(0);
     const pageNum = ref(1);
     const pageSize = computed(() => props2.paginationPageSize);
-    const handleChildrenColumns = (_columns) => {
+    const handleChildrenColumns = (_columns = []) => {
       if (Array.isArray(_columns) && _columns.length > 0) {
         const len = _columns.length;
         const columnsFixedNum = props2.columnsFixedNum;
@@ -6859,25 +6856,22 @@ const _sfc_main$1 = defineComponent({
       }
     };
     const handleColumns = (columns = []) => {
-      let _columns = [];
-      const isUseSeq = props2.isUseSeq;
-      if (isUseSeq) {
-        _columns.push({
+      if (props2.isUseSeq) {
+        columns.unshift({
           title: "\u5E8F\u53F7",
           dataIndex: "SEQ",
           align: "center"
         });
       }
-      _columns = _columns.concat(cloneDeep(columns));
       if (props2.isUseAction) {
-        _columns.push({
+        columns.push({
           title: "\u64CD\u4F5C",
           dataIndex: "ACTION",
           width: props2.actionColumnWidth
         });
       }
-      handleChildrenColumns(_columns);
-      myColumns.value = _columns;
+      handleChildrenColumns(columns);
+      return columns;
     };
     watch(() => [
       props2.columns,
@@ -6888,7 +6882,7 @@ const _sfc_main$1 = defineComponent({
       props2.cellBackgroundColor,
       props2.borderColor
     ], () => {
-      handleColumns(props2.columns);
+      myColumns.value = handleColumns(cloneDeep(props2.columns));
     }, {
       immediate: true,
       deep: true
@@ -6897,6 +6891,21 @@ const _sfc_main$1 = defineComponent({
       if (dataType !== "static")
         return;
       myDataSource.value = data;
+    }, {
+      immediate: true
+    });
+    watch(() => [props2.isReverse, myColumns.value, myDataSource.value], () => {
+      if (props2.isReverse) {
+        const { columns, dataSource } = handleReverseTable(cloneDeep(unref(myColumns)), cloneDeep(unref(myDataSource)));
+        tableColumns.value = columns;
+        tableDataSource.value = dataSource;
+      } else {
+        tableColumns.value = unref(myColumns);
+        tableDataSource.value = unref(myDataSource);
+      }
+    }, {
+      immediate: true,
+      flush: "post"
     });
     const handleReverseTable = (columns, dataSource) => {
       const firstColumns = columns[0];
@@ -6931,19 +6940,6 @@ const _sfc_main$1 = defineComponent({
         dataSource: _dataSource
       };
     };
-    watch(() => [props2.isReverse, myColumns.value, myDataSource.value], () => {
-      if (props2.isReverse) {
-        const { columns, dataSource } = handleReverseTable(unref(myColumns), unref(myDataSource));
-        tableColumns.value = columns;
-        tableDataSource.value = dataSource;
-      } else {
-        tableColumns.value = cloneDeep(unref(myColumns));
-        tableDataSource.value = cloneDeep(unref(myDataSource));
-      }
-    }, {
-      deep: true,
-      immediate: true
-    });
     const orderCondition = ref("");
     const requestData = useRequestData(props2);
     const loading = ref(false);
@@ -7044,7 +7040,8 @@ const _sfc_main$1 = defineComponent({
     });
     const handleIndicatorDataset = (dataColumns = [], dataRows = []) => {
       const _columns = dataColumns.map((column) => ({ title: column, dataIndex: column, key: column }));
-      handleColumns(_columns);
+      const columns = handleColumns(_columns);
+      myColumns.value = columns;
       myDataSource.value = dataRows;
     };
     const indicatorData = useIndicatorData(props2);
@@ -7086,16 +7083,17 @@ const _sfc_main$1 = defineComponent({
     });
     const summaryList = computed(() => {
       const columns = unref(tableColumns);
-      let summaryList2 = [];
-      if (props2.isUseSeq) {
-        columns.shift();
-        summaryList2 = [{ total: "\u5C0F\u8BA1" }];
-      }
+      const summaryList2 = [];
       let calcTotalCount = 0;
       for (let i = 0; i < columns.length; i++) {
         const column = columns[i];
         const { isCalcTotal } = column;
-        if (isCalcTotal) {
+        if (props2.isUseSeq && i === 0) {
+          summaryList2.push({
+            ...column,
+            total: "\u5C0F\u8BA1"
+          });
+        } else if (isCalcTotal) {
           summaryList2.push({
             ...column,
             index: i,
@@ -7172,24 +7170,27 @@ const _sfc_main$1 = defineComponent({
       formatFn,
       contrastClass,
       tableChange,
-      tableDataSource,
-      tableColumns,
+      myColumns,
+      myDataSource,
       summaryList,
       loading,
       onTouchHrefEvent,
       handleHref,
       handleHrefTarget,
-      useRowIndex
+      useRowIndex,
+      tableColumns,
+      tableDataSource
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_3e5c9238_lang = "";
+const Table_vue_vue_type_style_index_0_scoped_292c12ab_lang = "";
 const Table_vue_vue_type_style_index_1_lang = "";
-const _hoisted_1$1 = {
+const _hoisted_1$1 = { key: 0 };
+const _hoisted_2 = {
   key: 1,
   class: "action-list"
 };
-const _hoisted_2 = ["href", "target", "onClick"];
+const _hoisted_3 = ["href", "target", "onClick"];
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_table_summary_cell = resolveComponent("a-table-summary-cell");
   const _component_a_table_summary_row = resolveComponent("a-table-summary-row");
@@ -7230,13 +7231,8 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
             }, toDisplayString(column.title), 5)
           ]),
           bodyCell: withCtx(({ column, index: index2, text, record }) => [
-            column.dataIndex === "SEQ" ? (openBlock(), createElementBlock("span", {
-              key: 0,
-              style: normalizeStyle({
-                fontSize: _ctx.fontSize,
-                fontWeight: _ctx.fontWeight
-              })
-            }, toDisplayString(index2 + 1), 5)) : column.dataIndex === "ACTION" ? (openBlock(), createElementBlock("div", _hoisted_1$1, [
+            column.dataIndex === "SEQ" ? (openBlock(), createElementBlock("span", _hoisted_1$1, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
+            column.dataIndex === "ACTION" ? (openBlock(), createElementBlock("div", _hoisted_2, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.actionList, (action, index22) => {
                 return openBlock(), createElementBlock("div", {
                   class: "action",
@@ -7251,7 +7247,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                       fontWeight: _ctx.fontWeight
                     }),
                     onClick: ($event) => _ctx.onTouchHrefEvent(action.target, _ctx.handleHref(action.href, record))
-                  }, toDisplayString(action.title), 13, _hoisted_2)
+                  }, toDisplayString(action.title), 13, _hoisted_3)
                 ]);
               }), 128))
             ])) : (openBlock(), createElementBlock("div", {
@@ -7261,7 +7257,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                 fontSize: _ctx.fontSize,
                 fontWeight: _ctx.fontWeight
               })
-            }, toDisplayString((column.format != null || column.format !== "") && _ctx.formatFn(text, column.format)), 7))
+            }, toDisplayString(column.format != null ? _ctx.formatFn(text, column.format) : text), 7))
           ]),
           summary: withCtx(() => [
             _ctx.summaryList.length > 0 ? (openBlock(), createBlock(_component_a_table_summary, { key: 0 }, {
@@ -7305,7 +7301,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-3e5c9238"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-292c12ab"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,