@ecan-bi/datav 1.1.5 → 1.1.7

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.1.5 */
+/*! @ecan-bi/datav@1.1.7 */
 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";
@@ -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"];
@@ -2824,7 +2837,6 @@ const _sfc_main$n = defineComponent({
         let usedVariable = data[v];
         if (usedVariable != null) {
           const format = props2.format;
-          console.log("format", format);
           if (format === "percentage") {
             usedVariable = +usedVariable;
             if (!isNaN(usedVariable)) {
@@ -2838,7 +2850,6 @@ const _sfc_main$n = defineComponent({
               text = text.replace(variable, `<span style="color:${props2.variableColor};font-size:${props2.variableFontSize}">${0}%</span>`);
             }
           } else if (format === "percent") {
-            console.log("format", format);
             usedVariable = +usedVariable;
             if (!isNaN(usedVariable)) {
               usedVariable = (usedVariable * 100).toFixed(2);
@@ -2926,7 +2937,7 @@ const _sfc_main$n = defineComponent({
     };
   }
 });
-const Text_vue_vue_type_style_index_0_scoped_0a5690c3_lang = "";
+const Text_vue_vue_type_style_index_0_scoped_445a06d8_lang = "";
 const _hoisted_1$8 = ["innerHTML"];
 function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_skeleton = resolveComponent("skeleton");
@@ -2944,7 +2955,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$8));
 }
-const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-0a5690c3"]]);
+const Text = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-445a06d8"]]);
 const EcanText = withInstall(Text);
 const _sfc_main$m = defineComponent({
   name: "EcanScrollText",
@@ -3166,7 +3177,7 @@ const _hoisted_4$2 = {
   class: "ranking"
 };
 const _hoisted_5$2 = /* @__PURE__ */ _withScopeId$1(() => /* @__PURE__ */ createElementVNode("div", { class: "icon" }, null, -1));
-const _hoisted_6$2 = { class: "sort" };
+const _hoisted_6$1 = { class: "sort" };
 const _hoisted_7$1 = {
   key: 2,
   class: "empty"
@@ -3228,7 +3239,7 @@ function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
             }, [
               _ctx.useRanking ? (openBlock(), createElementBlock("div", _hoisted_4$2, [
                 _hoisted_5$2,
-                createElementVNode("div", _hoisted_6$2, " Top " + toDisplayString(i + 1), 1)
+                createElementVNode("div", _hoisted_6$1, " Top " + toDisplayString(i + 1), 1)
               ])) : createCommentVNode("", true),
               (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
                 return openBlock(), createElementBlock("div", {
@@ -6223,7 +6234,7 @@ const _hoisted_2$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createEl
 const _hoisted_3$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-left border-item" }, null, -1));
 const _hoisted_4$1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "bottom-right border-item" }, null, -1));
 const _hoisted_5$1 = { class: "title-item-wrapper" };
-const _hoisted_6$1 = { class: "title-item" };
+const _hoisted_6 = { class: "title-item" };
 const _hoisted_7 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("img", {
   class: "title-decoration-left",
   src: _imports_0
@@ -6266,7 +6277,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
       style: normalizeStyle(_ctx.borderStyle)
     }, [
       createElementVNode("div", _hoisted_5$1, [
-        createElementVNode("div", _hoisted_6$1, [
+        createElementVNode("div", _hoisted_6, [
           _hoisted_7,
           createElementVNode("div", _hoisted_8, toDisplayString(_ctx.title), 1),
           _hoisted_9
@@ -6736,6 +6747,7 @@ const tableProps = {
   paginationPageSize: 10,
   isUseAction: false,
   clickHighlight: false,
+  filterDropdownHeight: "200px",
   actionList: [{
     title: "",
     href: "",
@@ -6840,7 +6852,9 @@ const _sfc_main$1 = defineComponent({
             cellColor,
             dataIndex,
             title,
-            tableFilter
+            tableFilter,
+            headerCellAlign,
+            headerCellColor
           } = column;
           if (tableFilter) {
             filterDataIndexList.push(dataIndex);
@@ -6849,6 +6863,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,
@@ -7232,7 +7257,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;
@@ -7267,20 +7292,16 @@ const _sfc_main$1 = defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_43db63c3_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 = {
-  class: "ecan-table-filter",
-  style: { "padding": "8px" }
-};
-const _hoisted_2 = /* @__PURE__ */ createTextVNode(" \u641C\u7D22 ");
-const _hoisted_3 = /* @__PURE__ */ createTextVNode(" \u91CD\u7F6E ");
-const _hoisted_4 = { key: 0 };
-const _hoisted_5 = {
+const _hoisted_1$1 = /* @__PURE__ */ createTextVNode(" \u641C\u7D22 ");
+const _hoisted_2 = /* @__PURE__ */ createTextVNode(" \u91CD\u7F6E ");
+const _hoisted_3 = { key: 0 };
+const _hoisted_4 = {
   key: 1,
   class: "action-list"
 };
-const _hoisted_6 = ["href", "target", "onClick"];
+const _hoisted_5 = ["href", "target", "onClick"];
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_input = resolveComponent("a-input");
   const _component_a_checkbox_group = resolveComponent("a-checkbox-group");
@@ -7310,21 +7331,13 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
           pagination: _ctx.pagination,
           onChange: _ctx.tableChange
         }, {
-          headerCell: withCtx(({ column }) => [
+          customFilterDropdown: withCtx(({ column, selectedKeys, setSelectedKeys, confirm, clearFilters }) => [
             createElementVNode("div", {
+              class: "ecan-table-filter",
               style: normalizeStyle({
-                fontSize: _ctx.headerFontSize,
-                fontWeight: _ctx.headerFontWeight,
-                width: "100%",
-                height: "100%",
-                textAlign: column.headerCellAlign || "center",
-                color: column.headerCellColor,
-                borderBottomColor: _ctx.borderColor
+                height: _ctx.filterDropdownHeight
               })
-            }, toDisplayString(column.title), 5)
-          ]),
-          customFilterDropdown: withCtx(({ column, selectedKeys, setSelectedKeys, confirm, clearFilters }) => [
-            createElementVNode("div", _hoisted_1$1, [
+            }, [
               createVNode(_component_a_input, {
                 value: column.filterOptionsInputValue,
                 "onUpdate:value": ($event) => column.filterOptionsInputValue = $event,
@@ -7339,32 +7352,34 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                 options: _ctx.useFilterOptions(column),
                 onChange: ($event) => _ctx.useSetSelectedKeys(setSelectedKeys, column)
               }, null, 8, ["value", "onUpdate:value", "options", "onChange"]),
-              createVNode(_component_a_button, {
-                type: "primary",
-                size: "small",
-                style: { "width": "90px", "margin-right": "8px" },
-                onClick: () => confirm()
-              }, {
-                default: withCtx(() => [
-                  _hoisted_2
-                ]),
-                _: 2
-              }, 1032, ["onClick"]),
-              createVNode(_component_a_button, {
-                size: "small",
-                style: { "width": "90px" },
-                onClick: ($event) => _ctx.onResetFilter(clearFilters)
-              }, {
-                default: withCtx(() => [
-                  _hoisted_3
-                ]),
-                _: 2
-              }, 1032, ["onClick"])
-            ])
+              createElementVNode("div", null, [
+                createVNode(_component_a_button, {
+                  type: "primary",
+                  size: "small",
+                  style: { "width": "90px", "margin-right": "8px" },
+                  onClick: () => confirm()
+                }, {
+                  default: withCtx(() => [
+                    _hoisted_1$1
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"]),
+                createVNode(_component_a_button, {
+                  size: "small",
+                  style: { "width": "90px" },
+                  onClick: ($event) => _ctx.onResetFilter(clearFilters, column)
+                }, {
+                  default: withCtx(() => [
+                    _hoisted_2
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"])
+              ])
+            ], 4)
           ]),
           bodyCell: withCtx(({ column, index: index2, text, record }) => [
-            column.dataIndex === "SEQ" ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
-            column.dataIndex === "ACTION" ? (openBlock(), createElementBlock("div", _hoisted_5, [
+            column.dataIndex === "SEQ" ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(index2 + 1), 1)) : createCommentVNode("", true),
+            column.dataIndex === "ACTION" ? (openBlock(), createElementBlock("div", _hoisted_4, [
               (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.actionList, (action, index22) => {
                 return openBlock(), createElementBlock("div", {
                   class: "action",
@@ -7379,7 +7394,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_6)
+                  }, toDisplayString(action.title), 13, _hoisted_5)
                 ]);
               }), 128))
             ])) : (openBlock(), createElementBlock("div", {
@@ -7433,7 +7448,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-43db63c3"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-2403ec91"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,