@ecan-bi/datav 1.1.6 → 1.1.7

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.6 */
+/*! @ecan-bi/datav@1.1.7 */
 (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) {
@@ -1724,21 +1724,34 @@
         return;
       let _params = {};
       requestParams.forEach((param) => {
-        var _a2;
         const { key, value } = param;
         if (typeof value === "object" && value.id) {
           let record = {};
-          const { id, prop, propKey } = value;
+          const { id, prop, propKey, operate } = value;
           if (id === "THIS") {
             record = getGlobalModel(vue.unref(touchEventId)) || {};
           } else {
             record = getGlobalModel(id) || {};
           }
           const p = vue.unref(record[prop]);
-          let v = "";
+          let v = null;
           const isNeedFormat = ["date", "range"].some((item) => lowerCaseIncludes(record == null ? void 0 : record.type, item));
           if (isNeedFormat) {
-            v = ((_a2 = vue.unref(p)) == null ? void 0 : _a2.format((propKey == null ? void 0 : propKey.trim()) || record.format)) || "";
+            const { value: value2, type, mode } = operate || {};
+            if (value2 && type && mode) {
+              switch (type) {
+                case "add":
+                  v = vue.unref(p).add(value2, mode);
+                  break;
+                case "minus":
+                  v = vue.unref(p).subtract(value2, mode);
+                  break;
+              }
+            }
+            if (v == null) {
+              v = vue.unref(p);
+            }
+            v = (v == null ? void 0 : v.format((propKey == null ? void 0 : propKey.trim()) || record.format)) || "";
           } else {
             if (Object.prototype.toString.call(p) === "[object Object]") {
               v = p[propKey || "value"];
@@ -6844,7 +6857,9 @@
               cellColor,
               dataIndex,
               title,
-              tableFilter
+              tableFilter,
+              headerCellAlign,
+              headerCellColor
             } = column;
             if (tableFilter) {
               filterDataIndexList.push(dataIndex);
@@ -6853,6 +6868,17 @@
               column.customFilterDropdown = true;
               column.onFilter = (value, record) => record[dataIndex].toString().toLowerCase().includes(value.toLowerCase());
             }
+            column.customHeaderCell = () => ({
+              style: {
+                display: "table-cell",
+                verticalAlign: "middle",
+                fontSize: props2.headerFontSize,
+                fontWeight: props2.headerFontWeight,
+                textAlign: headerCellAlign || "center",
+                color: headerCellColor,
+                borderBottomColor: props2.borderColor
+              }
+            });
             column.customCell = (record, rowIndex) => ({
               style: {
                 textAlign: cellAlign,
@@ -7236,7 +7262,7 @@
           const _inputValue = vue.unref(column.filterOptionsInputValue).trim();
           if (Array.isArray(filterOptions)) {
             filterOptions = filterOptions.filter((filterOption) => {
-              if (filterOption.label) {
+              if (typeof filterOption.label === "string") {
                 return filterOption.label.toLowerCase().includes(_inputValue.toLowerCase());
               }
               return true;
@@ -7271,7 +7297,7 @@
       };
     }
   });
-  const Table_vue_vue_type_style_index_0_scoped_915e7876_lang = "";
+  const Table_vue_vue_type_style_index_0_scoped_2403ec91_lang = "";
   const Table_vue_vue_type_style_index_1_lang = "";
   const _hoisted_1$1 = /* @__PURE__ */ vue.createTextVNode(" \u641C\u7D22 ");
   const _hoisted_2 = /* @__PURE__ */ vue.createTextVNode(" \u91CD\u7F6E ");
@@ -7310,19 +7336,6 @@
             pagination: _ctx.pagination,
             onChange: _ctx.tableChange
           }, {
-            headerCell: vue.withCtx(({ column }) => [
-              vue.createElementVNode("div", {
-                style: vue.normalizeStyle({
-                  fontSize: _ctx.headerFontSize,
-                  fontWeight: _ctx.headerFontWeight,
-                  width: "100%",
-                  height: "100%",
-                  textAlign: column.headerCellAlign || "center",
-                  color: column.headerCellColor,
-                  borderBottomColor: _ctx.borderColor
-                })
-              }, vue.toDisplayString(column.title), 5)
-            ]),
             customFilterDropdown: vue.withCtx(({ column, selectedKeys, setSelectedKeys, confirm, clearFilters }) => [
               vue.createElementVNode("div", {
                 class: "ecan-table-filter",
@@ -7359,7 +7372,7 @@
                   vue.createVNode(_component_a_button, {
                     size: "small",
                     style: { "width": "90px" },
-                    onClick: ($event) => _ctx.onResetFilter(clearFilters)
+                    onClick: ($event) => _ctx.onResetFilter(clearFilters, column)
                   }, {
                     default: vue.withCtx(() => [
                       _hoisted_2
@@ -7440,7 +7453,7 @@
       }, 8, ["loading"])
     ], 4);
   }
-  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-915e7876"]]);
+  const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-2403ec91"]]);
   const EcanTable = withInstall(Table);
   const mapProps = {
     ...props,