ns-base-module 1.0.28 → 1.0.30

package/dist/FilterPopover/Filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA0bhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAudhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/FilterPopover/Filter.js

@@ -69,10 +69,12 @@ var Filter = function Filter(props) {
     searchval = _useState6[0],
     setSearchval = _useState6[1];
   var searchValue = useRef("");
+  var searchEmnuValue = useRef([]); // 枚举搜索
+
   var page = useRef({
     pageNum: 1,
-    pageSize: 20,
-    total: 20
+    pageSize: 40,
+    total: 40
   });
   // const [pageNum, setPageNum] = useState(1);
   // const [pageSize, setPageSize] = useState(20);
@@ -103,12 +105,21 @@ var Filter = function Filter(props) {
             setList(_list);
             return _context.abrupt("return");
           case 4:
-            _searchArgument = searchValue.current === "" ? {} : _defineProperty({}, dataIndex, {
-              value: entryType === "InputNumber" ? Number(searchValue.current) : searchValue.current,
-              criteriaType: ["InputNumber", "DatePicker", "DateTimePicker"].includes(entryType) ? "Equals" : "Contains",
-              necessary: true
-              // criteriaType: 'In',
-            });
+            _searchArgument = {};
+            if (searchValue.current) {
+              _searchArgument = _defineProperty({}, dataIndex, {
+                value: entryType === "InputNumber" ? Number(searchValue.current) : searchValue.current,
+                criteriaType: ["InputNumber", "DatePicker", "DateTimePicker"].includes(entryType) ? "Equals" : "Contains",
+                necessary: true
+              });
+            } else if (searchEmnuValue.current) {
+              // 枚举搜索 用户输入label 需要前端找出value 在找接口
+              _searchArgument = _defineProperty({}, dataIndex, {
+                value: searchEmnuValue.current,
+                criteriaType: "In",
+                necessary: true
+              });
+            }
             params = {
               arguments: _objectSpread(_objectSpread({}, argument), _searchArgument),
               formTemplateCode: formTemplateCode,
@@ -118,12 +129,12 @@ var Filter = function Filter(props) {
               distinctField: [dataIndex],
               variablePara: variablePara
             };
-            _context.next = 8;
+            _context.next = 9;
             return request === null || request === void 0 ? void 0 : request("/querier/menu", {
               method: "POST",
               data: params
             });
-          case 8:
+          case 9:
             res = _context.sent;
             datas = get(res, "data.rows", []) || [];
             arr = [];
@@ -145,7 +156,7 @@ var Filter = function Filter(props) {
             }
             setTotal(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.total);
             page.current.total = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total;
-          case 17:
+          case 18:
           case "end":
             return _context.stop();
         }
@@ -200,10 +211,21 @@ var Filter = function Filter(props) {
     page.current.pageNum = 1;
     searchValue.current = value; // 过滤用 前端过滤时
 
-    // 枚举 只能前端搜索label 后端搜索value
+    // 枚举 前端搜索label 找出value 给后端搜索
     if (dictItems && dictItems.length || !(menuCode && formTemplateCode)) {
-      setSearchval(value); // 搜索用
-      return;
+      // 找枚举的value
+      if (value) {
+        var _values = [];
+        dictItems === null || dictItems === void 0 || dictItems.forEach(function (item) {
+          if (item.label.includes(value)) {
+            _values.push(item.value);
+          }
+        });
+        searchEmnuValue.current = _values;
+        searchValue.current = "";
+      } else {
+        searchEmnuValue.current = [];
+      }
     }
     getDates();
   };
@@ -368,6 +390,14 @@ var Filter = function Filter(props) {
     allowClear: true,
     onSearch: onSearch,
     onPaste: handlePaste
+    // placeholder={
+    //   (dictItems && dictItems.length) || !(menuCode && formTemplateCode)
+    //     ? initLang({
+    //         id: "button.rest.filterTip",
+    //         defaultValue: "只能筛选当前页",
+    //       })
+    //     : ""
+    // }
   }), /*#__PURE__*/React.createElement(React.Fragment, null, !!searchList.length && /*#__PURE__*/React.createElement(Checkbox, {
     checked: allChecked,
     indeterminate: checked.length > 0 && checked.length < list.length,

package/dist/SubtotalsModal/addSubtotals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addSubtotals.d.ts","sourceRoot":"","sources":["addSubtotals.tsx"],"names":[],"mappings":"AACA,OAAO,KAMN,MAAM,OAAO,CAAC;AAGf,OAAO,4CAA4C,CAAC;AAKpD,UAAU,MAAM;IACd,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAEtC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB,aAAa,CAAC,EAAE,GAAG,CAAC;IAEpB,SAAS,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CAClC;;AAuFD,wBAAiC"}
+{"version":3,"file":"addSubtotals.d.ts","sourceRoot":"","sources":["addSubtotals.tsx"],"names":[],"mappings":"AACA,OAAO,KAMN,MAAM,OAAO,CAAC;AAGf,OAAO,4CAA4C,CAAC;AAKpD,UAAU,MAAM;IACd,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAEtC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IAErB,aAAa,CAAC,EAAE,GAAG,CAAC;IAEpB,SAAS,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;CAClC;;AAwFD,wBAAiC"}

package/dist/SubtotalsModal/addSubtotals.js

@@ -51,7 +51,13 @@ var Index = function Index(props, ref) {
             return _context.abrupt("return");
           case 3:
             configsStr = (_quotaRef$current = quotaRef.current) === null || _quotaRef$current === void 0 ? void 0 : _quotaRef$current.getQuotaDataStr();
-            _context.next = 6;
+            if (configsStr) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            _context.next = 8;
             return setFormTemplates({
               form_template_code: formTemplateCode,
               menu_code: menuCode,
@@ -62,12 +68,12 @@ var Index = function Index(props, ref) {
               query_type: "list",
               type: "QUOTA_TMP" //'FORM_TMP' 列表模板，'QUOTA_TMP' 分类汇总模板
             });
-          case 6:
+          case 8:
             res = _context.sent;
             if (((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.code) === 200) {
               (_props$onCancel = props.onCancel) === null || _props$onCancel === void 0 || _props$onCancel.call(props);
             }
-          case 8:
+          case 10:
           case "end":
             return _context.stop();
         }

package/dist/SubtotalsModal/dndQuota.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dndQuota.d.ts","sourceRoot":"","sources":["dndQuota.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,4CAA4C,CAAC;AAapD,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AACD,UAAU,MAAM;IACd,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ,EAAE,CAAC;QACjB,UAAU,EAAE,QAAQ,EAAE,CAAC;QACvB,aAAa,EAAE,QAAQ,EAAE,CAAC;QAC1B,SAAS,EAAE,QAAQ,EAAE,CAAC;KACvB,CAAC;CACH;;AA4lBD,wBAAiC"}
+{"version":3,"file":"dndQuota.d.ts","sourceRoot":"","sources":["dndQuota.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,4CAA4C,CAAC;AAapD,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AACD,UAAU,MAAM;IACd,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ,EAAE,CAAC;QACjB,UAAU,EAAE,QAAQ,EAAE,CAAC;QACvB,aAAa,EAAE,QAAQ,EAAE,CAAC;QAC1B,SAAS,EAAE,QAAQ,EAAE,CAAC;KACvB,CAAC;CACH;;AA4mBD,wBAAiC"}

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, CalculatorOutlined, CalendarOutlined, DeleteOutlined, DownOutlined, FieldNumberOutlined, FieldStringOutlined, SortAscendingOutlined, SortDescendingOutlined, SwapOutlined } from "@ant-design/icons";
-import { Dropdown, Input, Popover, Radio, Space, Tooltip } from "antd";
+import { Dropdown, Input, message, Popover, Radio, Space, Tooltip } from "antd";
 import { find, get, isEmpty } from "lodash";
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { ReactSortable } from "react-sortablejs";
@@ -106,6 +106,18 @@ 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") {
+          if ((chartColumns === null || chartColumns === void 0 ? void 0 : chartColumns.length) === 1) {
+            message.warning("列不能为空");
+            return "";
+          }
+        }
         return JSON.stringify({
           list: list,
           numberList: numberList,
@@ -359,7 +371,7 @@ var Index = function Index(props, ref) {
         className: "dnd_quota__item_txt"
       }, /*#__PURE__*/React.createElement(Space, {
         size: 2
-      }, showMenuLabel(item.sumType), /*#__PURE__*/React.createElement(DownOutlined, null)))), item.noDelete ? null : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
+      }, showMenuLabel(item.sumType), /*#__PURE__*/React.createElement(DownOutlined, null)))), item.noDelete ? null : /*#__PURE__*/React.createElement(React.Fragment, null, valueRadio === "cross" && code === "quota" ? null : /*#__PURE__*/React.createElement(Popover, {
         overlayClassName: "popover-sum-content",
         content: /*#__PURE__*/React.createElement("div", {
           className: "popover-sum-wrap"
@@ -368,12 +380,16 @@ var Index = function Index(props, ref) {
           onClick: function onClick() {
             handleSorte(item, "asc", code);
           }
-        }, "\u5347\u5E8F", /*#__PURE__*/React.createElement(ArrowUpOutlined, null)), /*#__PURE__*/React.createElement("p", {
+        }, initLang({
+          id: "prompt.asc"
+        }), /*#__PURE__*/React.createElement(ArrowUpOutlined, null)), /*#__PURE__*/React.createElement("p", {
           className: "popover-sum-li ".concat((item === null || item === void 0 ? void 0 : item.sort) === "desc" ? "action" : ""),
           onClick: function onClick() {
             handleSorte(item, "desc", code);
           }
-        }, "\u964D\u5E8F", /*#__PURE__*/React.createElement(ArrowDownOutlined, null))),
+        }, initLang({
+          id: "prompt.desc"
+        }), /*#__PURE__*/React.createElement(ArrowDownOutlined, null))),
         trigger: "click",
         placement: "top",
         zIndex: 9998

package/dist/SubtotalsModal/viewSubtotals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"viewSubtotals.d.ts","sourceRoot":"","sources":["viewSubtotals.tsx"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAO5D,OAAO,4CAA4C,CAAC;AAIpD,UAAU,MAAM;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAyM3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"viewSubtotals.d.ts","sourceRoot":"","sources":["viewSubtotals.tsx"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAO5D,OAAO,4CAA4C,CAAC;AAKpD,UAAU,MAAM;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CA+M3B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/SubtotalsModal/viewSubtotals.js

@@ -26,6 +26,7 @@ import { queryData } from "../utils/services/global";
 // import { formatData } from '@/utils/utils';
 import { find, get } from "lodash";
 import "../../style/components/SubtotalsModal.scss";
+import errorMsg from "../utils/errorMsg";
 import { formatData } from "../utils/utils";
 import { getSummaryCol, loopColumns } from "./util";
 var Index = function Index(props) {
@@ -69,14 +70,14 @@ var Index = function Index(props) {
       var obj = JSON.parse(jsons);
       var _columns = [];
       var arr = [].concat(_toConsumableArray(obj.dimensionList), _toConsumableArray(obj.quotaList));
-      props.columns.forEach(function (item) {
+      arr.forEach(function (item) {
         var _findItem = find(arr, function (o) {
           return o.value === item.value;
         });
         if (_findItem) {
-          _columns.push(_objectSpread(_objectSpread({}, item), {}, {
-            dataIndex: item.value,
-            title: item.label,
+          _columns.push(_objectSpread(_objectSpread({}, _findItem), {}, {
+            dataIndex: _findItem.value,
+            title: _findItem.label,
             ellipsis: true
           }));
         }
@@ -132,8 +133,15 @@ var Index = function Index(props) {
             });
           case 4:
             res = _context.sent;
-            _res$data = res.data, code = _res$data.code, data = _res$data.data;
             setLoading(false);
+            _res$data = res.data, code = _res$data.code, data = _res$data.data;
+            if (!(code != 200)) {
+              _context.next = 10;
+              break;
+            }
+            errorMsg(res === null || res === void 0 ? void 0 : res.data);
+            return _context.abrupt("return");
+          case 10:
             if (data !== null && data !== void 0 && data.listFields && data !== null && data !== void 0 && data.listFields.length) {
               // 设置表头
               _columns = _toConsumableArray(data === null || data === void 0 ? void 0 : data.listFields);
@@ -148,7 +156,7 @@ var Index = function Index(props) {
               setSummary(data.summary);
               setTotal(data.total);
             }
-          case 9:
+          case 12:
           case "end":
             return _context.stop();
         }