ns-base-module 2.0.15 → 2.0.17

package/dist/FilterPopover/Filter.js

@@ -28,6 +28,7 @@ import Input from "../Entry/components/Input";
 import CopyCol from "../CopyCol";
 import { cloneDeep, find, flattenDeep, get, isFunction } from "lodash";
 import "../../style/components/FilterPopover.scss";
+import errorMsg from "../utils/errorMsg";
 import { initLang } from "../utils/language";
 // import request from "../utils/request";
 
@@ -98,7 +99,7 @@ var Filter = function Filter(props) {
   var getDates = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _searchEmnuValue$curr;
-      var _list, checkValues, _label, _searchArgument, params, res, datas, _res, _res2, dataRow, arr, _datas;
+      var _list, checkValues, _label, _searchArgument, params, res, datas, _res, _res2, _res3, dataRow, arr, _datas;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -148,7 +149,7 @@ var Filter = function Filter(props) {
             res = {};
             datas = [];
             if (!isFunction(request)) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
             _context.next = 14;
@@ -161,12 +162,15 @@ var Filter = function Filter(props) {
             datas = get(res, "data.rows", []) || [];
             setTotal((_res = res) === null || _res === void 0 || (_res = _res.data) === null || _res === void 0 ? void 0 : _res.total);
             page.current.total = (_res2 = res) === null || _res2 === void 0 || (_res2 = _res2.data) === null || _res2 === void 0 ? void 0 : _res2.total;
-          case 18:
+            if (((_res3 = res) === null || _res3 === void 0 ? void 0 : _res3.code) == 500) {
+              errorMsg(res);
+            }
+          case 19:
             if (!isFunction(newRequest)) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
-            _context.next = 21;
+            _context.next = 22;
             return newRequest === null || newRequest === void 0 ? void 0 : newRequest({
               url: "/api/querier/menu",
               method: "POST",
@@ -174,12 +178,12 @@ var Filter = function Filter(props) {
                 withFieldConfigs: false
               })
             });
-          case 21:
+          case 22:
             dataRow = _context.sent;
             datas = get(dataRow, "rows", []) || [];
             setTotal(dataRow === null || dataRow === void 0 ? void 0 : dataRow.total);
             page.current.total = dataRow === null || dataRow === void 0 ? void 0 : dataRow.total;
-          case 25:
+          case 26:
             arr = [];
             if (dataIndex) {
               datas.map(function (d) {
@@ -204,7 +208,7 @@ var Filter = function Filter(props) {
                 setChecked([].concat(_toConsumableArray(checked), arr));
               }
             }
-          case 31:
+          case 32:
           case "end":
             return _context.stop();
         }

package/dist/SubtotalsModal/addSubtotals.js

@@ -122,7 +122,8 @@ var Index = function Index(props, ref) {
     type: "primary",
     onClick: handleView,
     style: {
-      marginTop: 4
+      marginTop: 4,
+      height: "fit-content"
     },
     size: "small"
   }, initLang({

package/dist/SubtotalsModal/dndQuota.js

@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable no-case-declarations */
 /* eslint-disable react/no-unknown-property */
 import { ArrowDownOutlined, ArrowUpOutlined, BarChartOutlined, CalculatorOutlined, CalendarOutlined, ClearOutlined, DeleteOutlined, DotChartOutlined, DownOutlined, FieldNumberOutlined, FieldStringOutlined, LineChartOutlined, SortAscendingOutlined, SortDescendingOutlined, SwapOutlined, SwapRightOutlined } from "@ant-design/icons";
-import { Dropdown, Input, message, Popover, Space, Switch, Tooltip } from "antd";
+import { Dropdown, Input, Popover, Space, Switch, Tooltip } from "antd";
 import { cloneDeep, find, get, isEmpty } from "lodash";
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import { ReactSortable } from "react-sortablejs";
@@ -106,18 +106,19 @@ var Index = function Index(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       getQuotaDataStr: function getQuotaDataStr() {
-        if (isEmpty(dimensionList)) {
-          message.warning("维度不能为空");
-          return "";
-        } else if (isEmpty(quotaList)) {
-          message.warning("指标不能为空");
-          return "";
-        } else if (valueRadio === "cross" || valueRadio === "trans") {
-          if ((chartColumns === null || chartColumns === void 0 ? void 0 : chartColumns.length) === 1) {
-            message.warning("列不能为空");
-            return "";
-          }
-        }
+        // if (isEmpty(dimensionList)) {
+        //   message.warning("维度不能为空");
+        //   return "";
+        // } else if (isEmpty(quotaList)) {
+        //   message.warning("指标不能为空");
+        //   return "";
+        // } else if (valueRadio === "cross" || valueRadio === "trans") {
+        //   if (chartColumns?.length === 1) {
+        //     message.warning("列不能为空");
+        //     return "";
+        //   }
+        // }
+
         return JSON.stringify({
           list: list,
           numberList: numberList,

package/dist/TableHeaderConfigPopover/utils.js

@@ -130,7 +130,7 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
         frontEndFold: _findItem.frontEndFold
       });
     } else {
-      JsonPares[r].checked = false;
+      JsonPares[r].checked = true;
     }
   };
   for (var r = 0, t = JsonPares.length; r < t; r++) {