@ecan-bi/datav 1.0.76 → 1.0.78

package/dist/index.umd.js

@@ -1,4 +1,4 @@
-/*! @ecan-bi/datav@1.0.76 */
+/*! @ecan-bi/datav@1.0.78 */
 (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("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", "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, 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, renderers, charts, components$1, echarts) {
@@ -6368,15 +6368,19 @@
           return;
         dataSource.value = data;
       });
+      const orderCondition = vue.ref(void 0);
       const requestData = useRequestData(props2);
       const loading = vue.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: vue.unref(pageNum),
-            pageSize: vue.unref(pageSize)
+            pageSize: vue.unref(pageSize),
+            orderCondition: vue.unref(orderCondition),
+            layer: "1"
           });
           const { rows = [], total: tableTotal = 0 } = ((_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.data) || {};
           total.value = tableTotal;
@@ -6387,8 +6391,21 @@
           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 = vue.computed(() => {
         const simple = props2.simple;
@@ -6467,12 +6484,12 @@
           setGlobalModel(id, { ...modal, RECORD: record });
         })
       });
-      const refreshData = () => {
+      const refreshData = (isUseLoading = true) => {
         if (vue.unref(pageMode) === "design")
           return;
         switch (props2.dataType) {
           case "request":
-            handleRequestData();
+            handleRequestData(isUseLoading);
             break;
           case "indicator":
             handleIndicatorData();
@@ -6672,7 +6689,7 @@
       }, 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-4ed03b13"]]);
   const EcanTable = withInstall(Table);
   const mapProps = {
     ...props,