@ecan-bi/datav 1.0.75 → 1.0.77

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.75 */
+/*! @ecan-bi/datav@1.0.77 */
 var _a, _b, _c;
 import { watch, inject, computed, unref, watchEffect, defineComponent, shallowRef, toRefs, onMounted, onUnmounted, h, nextTick, createVNode, resolveComponent, openBlock, createElementBlock, createBlock, renderSlot, withCtx, ref, normalizeStyle, createCommentVNode, provide, toDisplayString, Fragment, renderList, createElementVNode, normalizeClass, pushScopeId, popScopeId, createSlots, resolveDynamicComponent, mergeProps, withModifiers, withDirectives, vShow } from "vue";
 import { throttle, init, use, registerMap } from "echarts/core";
@@ -2795,7 +2795,7 @@ const _sfc_main$l = defineComponent({
               if (usedVariable >= 0) {
                 text = text.replace(variable, `<span style="color:#ED6643;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goUp}"/>${usedVariable}%</span>`);
               } else {
-                text = text.replace(variable, `<span style="color: #6ACB97;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goDown}"/>${usedVariable}%</span>`);
+                text = text.replace(variable, `<span style="color: #6ACB97;font-size:${props2.variableFontSize}"><img style="width: ${props2.variableFontSize}" src="${goDown}"/>${Math.abs(usedVariable)}%</span>`);
               }
             } else {
               text = text.replace(variable, `<span style="color:${props2.variableColor};font-size:${props2.variableFontSize}">${0}%</span>`);
@@ -2877,7 +2877,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
     onClick: _cache[0] || (_cache[0] = (...args) => _ctx.click && _ctx.click(...args))
   }, null, 12, _hoisted_1$7));
 }
-const Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-2c15326b"]]);
+const Text = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__scopeId", "data-v-04fdee06"]]);
 const EcanText = withInstall(Text);
 const ScrollText_vue_vue_type_style_index_0_scoped_true_lang = "";
 const _sfc_main$k = defineComponent({
@@ -3195,7 +3195,7 @@ const proportionProps = {
   data: {
     percent: 0.3
   },
-  text: "",
+  text: "{percent}%",
   fontSize: "26px",
   color: "#4091f7",
   strokeWidth: 6,
@@ -6362,15 +6362,18 @@ const _sfc_main$1 = defineComponent({
         return;
       dataSource.value = data;
     });
+    const orderCondition = ref(void 0);
     const requestData = useRequestData(props2);
     const loading = ref(false);
-    const handleRequestData = async () => {
+    const handleRequestData = async (isUseLoading = true) => {
       var _a2;
       try {
-        loading.value = true;
+        if (isUseLoading)
+          loading.value = true;
         const res = await requestData({
           pageNum: unref(pageNum),
-          pageSize: unref(pageSize)
+          pageSize: unref(pageSize),
+          orderCondition: unref(orderCondition)
         });
         const { rows = [], total: tableTotal = 0 } = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.data) || {};
         total.value = tableTotal;
@@ -6381,8 +6384,21 @@ const _sfc_main$1 = defineComponent({
         loading.value = false;
       }
     };
-    const tableChange = ({ current }, _filters, _sorter) => {
+    const tableChange = ({ current }, _filters, sorter) => {
       pageNum.value = current;
+      if (sorter && Object.keys(sorter).length > 0) {
+        const { field, order } = sorter;
+        const map = {
+          ascend: "asc",
+          descend: "desc"
+        };
+        const fieldOrder = map[order];
+        if (field != null && fieldOrder != null) {
+          orderCondition.value = field + " " + fieldOrder;
+          pageNum.value = 1;
+        }
+      }
+      refreshData(false);
     };
     const pagination = computed(() => {
       const simple = props2.simple;
@@ -6461,12 +6477,12 @@ const _sfc_main$1 = defineComponent({
         setGlobalModel(id, { ...modal, RECORD: record });
       })
     });
-    const refreshData = () => {
+    const refreshData = (isUseLoading = true) => {
       if (unref(pageMode) === "design")
         return;
       switch (props2.dataType) {
         case "request":
-          handleRequestData();
+          handleRequestData(isUseLoading);
           break;
         case "indicator":
           handleIndicatorData();
@@ -6666,7 +6682,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-56012732"]]);
+const Table = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-34b40a0f"]]);
 const EcanTable = withInstall(Table);
 const mapProps = {
   ...props,