@ecan-bi/datav 1.1.1 → 1.1.2

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.1 */
+/*! @ecan-bi/datav@1.1.2 */
 (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,7 +1565,6 @@
   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
@@ -1682,8 +1681,6 @@
         const usedVariable = data[textVariable];
         if (usedVariable != null) {
           statement = statement.replace(textVariable, usedVariable);
-        } else {
-          statement = statement.replace(textVariable, "");
         }
       }
       try {
@@ -3155,7 +3152,7 @@
     key: 0,
     class: "ranking"
   };
-  const _hoisted_3$1 = {
+  const _hoisted_3$2 = {
     key: 1,
     class: "ecan-list-content"
   };
@@ -3203,7 +3200,7 @@
               ], 4);
             }), 128))
           ])) : vue.createCommentVNode("", true),
-          _ctx.dataSource.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$1, [
+          _ctx.dataSource.length > 0 ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$2, [
             _ctx.useTitle ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
               class: "title-placeholder",
@@ -6218,7 +6215,7 @@
   const _withScopeId = (n) => (vue.pushScopeId("data-v-f3fc1305"), n = n(), vue.popScopeId(), n);
   const _hoisted_1$5 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "top-left border-item" }, null, -1));
   const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "top-right border-item" }, null, -1));
-  const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
+  const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
   const _hoisted_4 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ vue.createElementVNode("div", { class: "bottom-right border-item" }, null, -1));
   const _hoisted_5 = { class: "title-item-wrapper" };
   const _hoisted_6 = { class: "title-item" };
@@ -6254,7 +6251,7 @@
         _ctx.useBorderModify ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
           _hoisted_1$5,
           _hoisted_2$1,
-          _hoisted_3,
+          _hoisted_3$1,
           _hoisted_4
         ], 64)) : vue.createCommentVNode("", true)
       ], 4)) : vue.createCommentVNode("", true),
@@ -6813,13 +6810,13 @@
       const x = vue.computed(() => props2.scrollX);
       const y = vue.computed(() => parseFloat(props2.height) - vue.unref(splitY));
       const myColumns = vue.ref([]);
-      const myDataSource = vue.ref(props2.data);
+      const myDataSource = vue.ref([]);
       const tableColumns = vue.ref([]);
       const tableDataSource = vue.ref([]);
       const total = vue.ref(0);
       const pageNum = vue.ref(1);
       const pageSize = vue.computed(() => props2.paginationPageSize);
-      const handleChildrenColumns = (_columns) => {
+      const handleChildrenColumns = (_columns = []) => {
         if (Array.isArray(_columns) && _columns.length > 0) {
           const len = _columns.length;
           const columnsFixedNum = props2.columnsFixedNum;
@@ -6864,25 +6861,22 @@
         }
       };
       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(lodashEs.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;
       };
       vue.watch(() => [
         props2.columns,
@@ -6893,7 +6887,7 @@
         props2.cellBackgroundColor,
         props2.borderColor
       ], () => {
-        handleColumns(props2.columns);
+        myColumns.value = handleColumns(lodashEs.cloneDeep(props2.columns));
       }, {
         immediate: true,
         deep: true
@@ -6902,6 +6896,21 @@
         if (dataType !== "static")
           return;
         myDataSource.value = data;
+      }, {
+        immediate: true
+      });
+      vue.watch(() => [props2.isReverse, myColumns.value, myDataSource.value], () => {
+        if (props2.isReverse) {
+          const { columns, dataSource } = handleReverseTable(lodashEs.cloneDeep(vue.unref(myColumns)), lodashEs.cloneDeep(vue.unref(myDataSource)));
+          tableColumns.value = columns;
+          tableDataSource.value = dataSource;
+        } else {
+          tableColumns.value = vue.unref(myColumns);
+          tableDataSource.value = vue.unref(myDataSource);
+        }
+      }, {
+        immediate: true,
+        flush: "post"
       });
       const handleReverseTable = (columns, dataSource) => {
         const firstColumns = columns[0];
@@ -6936,19 +6945,6 @@
           dataSource: _dataSource
         };
       };
-      vue.watch(() => [props2.isReverse, myColumns.value, myDataSource.value], () => {
-        if (props2.isReverse) {
-          const { columns, dataSource } = handleReverseTable(vue.unref(myColumns), vue.unref(myDataSource));
-          tableColumns.value = columns;
-          tableDataSource.value = dataSource;
-        } else {
-          tableColumns.value = lodashEs.cloneDeep(vue.unref(myColumns));
-          tableDataSource.value = lodashEs.cloneDeep(vue.unref(myDataSource));
-        }
-      }, {
-        deep: true,
-        immediate: true
-      });
       const orderCondition = vue.ref("");
       const requestData = useRequestData(props2);
       const loading = vue.ref(false);
@@ -7049,7 +7045,8 @@
       });
       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);
@@ -7091,16 +7088,17 @@
       });
       const summaryList = vue.computed(() => {
         const columns = vue.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,
@@ -7177,24 +7175,27 @@
         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 = vue.resolveComponent("a-table-summary-cell");
     const _component_a_table_summary_row = vue.resolveComponent("a-table-summary-row");
@@ -7235,13 +7236,8 @@
               }, vue.toDisplayString(column.title), 5)
             ]),
             bodyCell: vue.withCtx(({ column, index: index2, text, record }) => [
-              column.dataIndex === "SEQ" ? (vue.openBlock(), vue.createElementBlock("span", {
-                key: 0,
-                style: vue.normalizeStyle({
-                  fontSize: _ctx.fontSize,
-                  fontWeight: _ctx.fontWeight
-                })
-              }, vue.toDisplayString(index2 + 1), 5)) : column.dataIndex === "ACTION" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$1, [
+              column.dataIndex === "SEQ" ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1$1, vue.toDisplayString(index2 + 1), 1)) : vue.createCommentVNode("", true),
+              column.dataIndex === "ACTION" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.actionList, (action, index22) => {
                   return vue.openBlock(), vue.createElementBlock("div", {
                     class: "action",
@@ -7256,7 +7252,7 @@
                         fontWeight: _ctx.fontWeight
                       }),
                       onClick: ($event) => _ctx.onTouchHrefEvent(action.target, _ctx.handleHref(action.href, record))
-                    }, vue.toDisplayString(action.title), 13, _hoisted_2)
+                    }, vue.toDisplayString(action.title), 13, _hoisted_3)
                   ]);
                 }), 128))
               ])) : (vue.openBlock(), vue.createElementBlock("div", {
@@ -7266,7 +7262,7 @@
                   fontSize: _ctx.fontSize,
                   fontWeight: _ctx.fontWeight
                 })
-              }, vue.toDisplayString((column.format != null || column.format !== "") && _ctx.formatFn(text, column.format)), 7))
+              }, vue.toDisplayString(column.format != null ? _ctx.formatFn(text, column.format) : text), 7))
             ]),
             summary: vue.withCtx(() => [
               _ctx.summaryList.length > 0 ? (vue.openBlock(), vue.createBlock(_component_a_table_summary, { key: 0 }, {
@@ -7310,7 +7306,7 @@
       }, 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,