@ecan-bi/datav 1.1.6 → 1.1.8

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.6 */
+/*! @ecan-bi/datav@1.1.8 */
 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, reactive, createTextVNode, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -1493,7 +1493,7 @@ const props = {
   isOpenRequestTimer: false,
   requestInterval: 1,
   requestSort: 0,
-  requestParams: [{ key: "", value: { id: "", prop: "" } }],
+  requestParams: [{ key: null, value: {} }],
   events: [],
   dataType: "static"
 };
@@ -1719,21 +1719,34 @@ const useRequestData = (props2, callBack = () => {
       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(unref(touchEventId)) || {};
         } else {
           record = getGlobalModel(id) || {};
         }
         const p = 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 = 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 = unref(p).add(value2, mode);
+                break;
+              case "minus":
+                v = unref(p).subtract(value2, mode);
+                break;
+            }
+          }
+          if (v == null) {
+            v = 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"];
@@ -5862,13 +5875,16 @@ const _sfc_main$7 = defineComponent({
           if (tooltipFormatter === "") {
             tooltipFormatter = "{marker} {a}    {c}";
           }
+          const seriesTypes = props2.seriesTypes;
           for (let i = 0; i < len; i++) {
+            const seriesType = seriesTypes[i];
+            const { tooltipFormatter: _tooltipFormatter } = seriesType || {};
             const { marker, seriesName, name, value, data } = params[i] || {};
             if (i === 0) {
               formatter += `${name}<br/>`;
             }
             formatter += useVariablesInText(
-              tooltipFormatter,
+              _tooltipFormatter || tooltipFormatter,
               {
                 marker,
                 name,
@@ -6839,7 +6855,9 @@ const _sfc_main$1 = defineComponent({
             cellColor,
             dataIndex,
             title,
-            tableFilter
+            tableFilter,
+            headerCellAlign,
+            headerCellColor
           } = column;
           if (tableFilter) {
             filterDataIndexList.push(dataIndex);
@@ -6848,6 +6866,17 @@ const _sfc_main$1 = defineComponent({
             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,
@@ -7231,7 +7260,7 @@ const _sfc_main$1 = defineComponent({
         const _inputValue = 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;
@@ -7266,7 +7295,7 @@ const _sfc_main$1 = defineComponent({
     };
   }
 });
-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__ */ createTextVNode(" \u641C\u7D22 ");
 const _hoisted_2 = /* @__PURE__ */ createTextVNode(" \u91CD\u7F6E ");
@@ -7305,19 +7334,6 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
           pagination: _ctx.pagination,
           onChange: _ctx.tableChange
         }, {
-          headerCell: withCtx(({ column }) => [
-            createElementVNode("div", {
-              style: normalizeStyle({
-                fontSize: _ctx.headerFontSize,
-                fontWeight: _ctx.headerFontWeight,
-                width: "100%",
-                height: "100%",
-                textAlign: column.headerCellAlign || "center",
-                color: column.headerCellColor,
-                borderBottomColor: _ctx.borderColor
-              })
-            }, toDisplayString(column.title), 5)
-          ]),
           customFilterDropdown: withCtx(({ column, selectedKeys, setSelectedKeys, confirm, clearFilters }) => [
             createElementVNode("div", {
               class: "ecan-table-filter",
@@ -7354,7 +7370,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                 createVNode(_component_a_button, {
                   size: "small",
                   style: { "width": "90px" },
-                  onClick: ($event) => _ctx.onResetFilter(clearFilters)
+                  onClick: ($event) => _ctx.onResetFilter(clearFilters, column)
                 }, {
                   default: withCtx(() => [
                     _hoisted_2
@@ -7435,7 +7451,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-915e7876"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-2403ec91"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,