ns-base-module 1.0.12 → 1.0.14

package/dist/ChooseModal/index.js

@@ -20,9 +20,9 @@ import React, { forwardRef, useImperativeHandle, useState } from "react";
 // import List from '@/components/v2/Order/List';
 // import type { ListConfigType } from '@/utils/type.d';
 // import { queryConfig } from '@/services/global';
+import FontIcon from "../Icon";
 import { initLang } from "../utils/language";
 import { handlePercentage } from "../utils/utils";
-import FontIcon from "../Icon";
 var Index = function Index(_ref, ref) {
   var _params$config, _params$config2;
   var children = _ref.children,

package/dist/Entry/components/TreeSelect.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
-import type { TreeSelectProps } from 'antd';
-import type { DefaultValueType } from 'rc-tree-select/lib/interface';
-declare const index: <T extends DefaultValueType>(props: TreeSelectProps<T, import("rc-tree-select/lib/interface").DataNode>) => React.JSX.Element;
-export default index;
+import type { TreeSelectProps } from "antd";
+import React from "react";
+declare const Index: (props: TreeSelectProps) => React.JSX.Element;
+export default Index;
 //# sourceMappingURL=TreeSelect.d.ts.map

package/dist/Entry/components/TreeSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TreeSelect.d.ts","sourceRoot":"","sources":["TreeSelect.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAE5C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAErE,QAAA,MAAM,KAAK,+HAOV,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"TreeSelect.d.ts","sourceRoot":"","sources":["TreeSelect.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAG5C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,QAAA,MAAM,KAAK,UAAW,eAAe,sBAYpC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/Entry/components/TreeSelect.js

@@ -5,14 +5,22 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React from 'react';
-import { TreeSelect } from 'antd';
-var index = function index(props) {
+/*
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+
+import { TreeSelect } from "antd";
+// import type { DefaultValueType } from "rc-tree-select/lib/interface";
+import React from "react";
+var Index = function Index(props) {
   var _style = _objectSpread({
-    width: '100%'
+    width: "100%"
   }, props.style);
   return /*#__PURE__*/React.createElement(TreeSelect, _extends({}, props, {
     style: _style
   }));
 };
-export default index;
+export default Index;

package/dist/Icon/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":";AAQA,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,QAAA,MAAM,QAAQ,+FASZ,CAAC;AAEH,eAAe,QAAQ,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":";AAQA,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,QAAA,MAAM,QAAQ,+FAQZ,CAAC;AAEH,eAAe,QAAQ,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,CAAC"}

package/dist/Icon/index.js

@@ -12,10 +12,9 @@ var IconFont = createFromIconfontCN({
   // iconfont项目名称：ant design 官方图标
   "//at.alicdn.com/t/font_2450829_w05sq2z5ti.js", "//at.alicdn.com/t/c/font_2450829_8bvott1swoo.js",
   // iconfont项目名称：NextStone RAMA
-  // '//at.alicdn.com/t/c/font_4504651_3ojm80uzjut.js',
   "//at.alicdn.com/t/c/font_4504651_66m3qjrc6st.js",
-  // 旧 使用ns-
-  "//at.alicdn.com/t/c/font_4504651_jp2tyhko4t.js" // 新 使用icon-
+  // // 旧配置 ns- 开头
+  "//at.alicdn.com/t/c/font_4504651_ejgod5p1qt6.js" //// 新配置 icon- 开头 兼容菜单 组件弹框选择 使用这份
   ]
 });
 export default IconFont;

package/dist/IconTools/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AASA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAwB,EACtB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI9D,aAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IAErC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,GAAG,mBAAmB,GACrB,mBAAmB,CAAC;AAEtB,QAAA,MAAM,KAAK,UAAW,aAAa,sBAuHlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAkB,MAAM,OAAO,CAAC;AACvC,OAAwB,EACtB,mBAAmB,EACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAK9D,aAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uBAAuB,CAAC,EAAE,MAAM,IAAI,CAAC;IAErC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;CACtD,GAAG,mBAAmB,GACrB,mBAAmB,CAAC;AAEtB,QAAA,MAAM,KAAK,UAAW,aAAa,sBAuHlC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/IconTools/index.js

@@ -1,10 +1,10 @@
 import { ColumnHeightOutlined, PicLeftOutlined, RedoOutlined, SwapOutlined } from "@ant-design/icons";
 import { Dropdown, Tooltip } from "antd";
-import { initLang } from "../utils/language";
 import React, { useMemo } from "react";
 import FilterClearIcon from "../FilterPopover/FilterClearIcon";
 import SubtotalsModal from "../SubtotalsModal";
 import TableHeaderConfigPopover from "../TableHeaderConfigPopover";
+import { initLang } from "../utils/language";
 import { adapterColumns } from "./utils";
 var Index = function Index(props) {
   var filterSearch = props.filterSearch,

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;AAIf,OAAO,4CAA4C,CAAC;AAIpD,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;CACrB;;AAsFD,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;CACrB;;AAsFD,wBAAiC"}

package/dist/SubtotalsModal/addSubtotals.js

@@ -12,8 +12,8 @@ import { Button, Col, Input, Row, message } from "antd";
 import React, { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 
 // import { commonRequest } from '../../../../services/global';
-import { initLang } from "../utils/language";
 import "../../style/components/SubtotalsModal.scss";
+import { initLang } from "../utils/language";
 import { setFormTemplates } from "../utils/services/global";
 import DndQuota from "./dndQuota";
 var Index = function Index(props, ref) {

package/dist/SubtotalsModal/dndQuota.d.ts

@@ -1,10 +1,13 @@
 import React from "react";
+import "../../style/components/SubtotalsModal.scss";
 interface IColumns {
     label: string;
     value: string;
-    entryType: string;
     dataType: string;
+    entryType?: string;
     sumType?: string;
+    bgColor?: string;
+    noDelete?: boolean;
 }
 interface Iprops {
     columns: IColumns[];

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

@@ -1 +1 @@
-{"version":3,"file":"dndQuota.d.ts","sourceRoot":"","sources":["dndQuota.tsx"],"names":[],"mappings":"AAWA,OAAO,KAKN,MAAM,OAAO,CAAC;AAWf,UAAU,QAAQ;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;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;;AAiWD,wBAAiC"}
+{"version":3,"file":"dndQuota.d.ts","sourceRoot":"","sources":["dndQuota.tsx"],"names":[],"mappings":"AAWA,OAAO,KAKN,MAAM,OAAO,CAAC;AAEf,OAAO,4CAA4C,CAAC;AAYpD,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;CACpB;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;;AAweD,wBAAiC"}

package/dist/SubtotalsModal/dndQuota.js

@@ -1,13 +1,13 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -17,10 +17,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /* eslint-disable no-case-declarations */
 /* eslint-disable react/no-unknown-property */
 import { CalendarOutlined, DeleteOutlined, DownOutlined, FieldNumberOutlined, FieldStringOutlined } from "@ant-design/icons";
-import { Dropdown, Radio, Space, Tooltip } from "antd";
+import { Dropdown, Popover, Radio, Space, Tooltip } from "antd";
 import { find, get, isEmpty } from "lodash";
 import React, { forwardRef, useEffect, useImperativeHandle, useState } from "react";
 import { ReactSortable } from "react-sortablejs";
+import "../../style/components/SubtotalsModal.scss";
+import IconFont from "../Icon";
+import { initLang } from "../utils/language";
 import { queryDictEnum } from "../utils/services/global";
 var component = [{
   compId: "1",
@@ -39,6 +42,28 @@ var component = [{
   compName: "日期选择器",
   compType: "date-picker"
 }];
+var sumEmnu = [{
+  label: "列总计",
+  value: "col",
+  datas: [{
+    label: initLang({
+      id: "prompt.sum.col.left"
+    }),
+    value: "left"
+  }, {
+    label: initLang({
+      id: "prompt.sum.col.right"
+    }),
+    value: "right"
+  }]
+}, {
+  label: "行总计",
+  value: "row",
+  datas: [{
+    label: "显示行总计",
+    value: "sumRow"
+  }]
+}];
 var Index = function Index(props, ref) {
   // const [components, setComponents] = useState<ItemType[]>(component);
   var _useState = useState([]),
@@ -69,6 +94,14 @@ var Index = function Index(props, ref) {
     _useState14 = _slicedToArray(_useState13, 2),
     valueRadio = _useState14[0],
     setValueRadio = _useState14[1];
+  var _useState15 = useState(null),
+    _useState16 = _slicedToArray(_useState15, 2),
+    sumColPosition = _useState16[0],
+    setSumColPosition = _useState16[1];
+  var _useState17 = useState(false),
+    _useState18 = _slicedToArray(_useState17, 2),
+    sumRow = _useState18[0],
+    setSumRow = _useState18[1];
   useImperativeHandle(ref, function () {
     return {
       getQuotaDataStr: function getQuotaDataStr() {
@@ -78,7 +111,9 @@ var Index = function Index(props, ref) {
           dimensionList: dimensionList,
           quotaList: quotaList,
           chartColumns: chartColumns,
-          valueRadio: valueRadio
+          valueRadio: valueRadio,
+          sumColPosition: sumColPosition,
+          sumRow: sumRow
         });
       }
     };
@@ -87,10 +122,8 @@ var Index = function Index(props, ref) {
   // 汇总方式枚举
   var getSummaryType = function getSummaryType() {
     queryDictEnum("summaryType").then(function (res) {
-      var _res$data;
-      if ((res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.code) == 200) {
-        var _res$data2;
-        setSummaryTypeArr((res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.data) || []);
+      if ((res === null || res === void 0 ? void 0 : res.code) == 200) {
+        setSummaryTypeArr((res === null || res === void 0 ? void 0 : res.data) || []);
       }
     });
   };
@@ -105,11 +138,48 @@ var Index = function Index(props, ref) {
     var initquotaList = get(props.initConfig, "quotaList", []);
     var initchartColumns = get(props.initConfig, "chartColumns", []);
     var _valueRadio = get(props.initConfig, "valueRadio", "list");
+    var _sumColPosition = get(props.initConfig, "sumColPosition", null);
+    var _sumRow = get(props.initConfig, "sumRow", false);
     var _dimensionList = [];
     var _chartColumns = [];
     var _quotaList = [];
     var _numberList = [];
     var _list = [];
+    initdimensionList.forEach(function (item) {
+      var findItem = find(props.columns, function (o) {
+        return o.value === item.value;
+      });
+      if (findItem) _dimensionList.push(_objectSpread(_objectSpread({}, item), findItem));
+    });
+    initquotaList.forEach(function (item) {
+      var findItem = find(props.columns, function (o) {
+        return o.value === item.value;
+      });
+      if (findItem) _quotaList.push(_objectSpread(_objectSpread({}, item), findItem));
+    });
+
+    // 加指标列
+    var _hasQuotasCol = false;
+    var _colPosition = {
+      dataType: "string",
+      value: "quotasColPosition",
+      label: "指标列",
+      bgColor: "#b07f02",
+      noDelete: true
+    };
+    initchartColumns.forEach(function (item) {
+      var findItem = find(props.columns, function (o) {
+        return o.value === item.value;
+      });
+      if (item.value === "quotasColPosition") {
+        _hasQuotasCol = true;
+        findItem = _colPosition;
+      }
+      if (findItem) _chartColumns.push(findItem);
+    });
+    if (!_hasQuotasCol) {
+      _chartColumns.unshift(_colPosition);
+    }
     (_props$columns = props.columns) === null || _props$columns === void 0 || _props$columns.forEach(function (item) {
       // 默认值
       var dimensionItem = find(initdimensionList, function (o) {
@@ -122,11 +192,11 @@ var Index = function Index(props, ref) {
         return o.value === item.value;
       });
       if (dimensionItem) {
-        _dimensionList.push(dimensionItem);
+        // _dimensionList.push(dimensionItem);
       } else if (chartItem) {
-        _chartColumns.push(chartItem);
+        // _chartColumns.push(chartItem);
       } else if (quotaItem) {
-        _quotaList.push(quotaItem);
+        // _quotaList.push(quotaItem);
       } else if (item.dataType === "number") {
         _numberList.push(item);
       } else {
@@ -139,6 +209,8 @@ var Index = function Index(props, ref) {
     setQuotaList(_quotaList);
     setChartColumns(_chartColumns);
     setValueRadio(_valueRadio);
+    setSumColPosition(_sumColPosition);
+    setSumRow(_sumRow);
   };
   useEffect(function () {
     initList();
@@ -193,12 +265,13 @@ var Index = function Index(props, ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, _list.map(function (item, index) {
       return /*#__PURE__*/React.createElement("div", {
         className: "dnd_quota__item",
-        key: item.value
-      }, /*#__PURE__*/React.createElement(Tooltip, {
-        title: item.label
+        key: item.value,
+        style: {
+          backgroundColor: item.bgColor ? item.bgColor : ""
+        }
       }, /*#__PURE__*/React.createElement("span", {
         className: "dnd_quota__item_label"
-      }, item.label)), /*#__PURE__*/React.createElement("div", null, code === "quota" && /*#__PURE__*/React.createElement(Dropdown, {
+      }, item.label), /*#__PURE__*/React.createElement("div", null, code === "quota" && /*#__PURE__*/React.createElement(Dropdown, {
         menu: {
           items: summaryTypeArr.map(function (d) {
             return _objectSpread(_objectSpread({}, d), {}, {
@@ -214,7 +287,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)))), /*#__PURE__*/React.createElement(DeleteOutlined, {
+      }, showMenuLabel(item.sumType), /*#__PURE__*/React.createElement(DownOutlined, null)))), item.noDelete ? null : /*#__PURE__*/React.createElement(DeleteOutlined, {
         style: {
           marginLeft: 6
         },
@@ -250,6 +323,19 @@ var Index = function Index(props, ref) {
   var onChangeRadio = function onChangeRadio(e) {
     setValueRadio(e.target.value);
   };
+  var handleSumType = function handleSumType(key, code) {
+    if (key === "col") {
+      if (code === sumColPosition) {
+        setSumColPosition(null);
+      } else {
+        setSumColPosition(code);
+      }
+    } else {
+      setSumRow(function (flag) {
+        return !flag;
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "dnd_quota_main"
   }, /*#__PURE__*/React.createElement("div", {
@@ -294,21 +380,66 @@ var Index = function Index(props, ref) {
     className: "dnd-quota-spce"
   }), /*#__PURE__*/React.createElement("div", {
     className: "dnd_quota_right"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center"
+    }
   }, /*#__PURE__*/React.createElement(Radio.Group, {
     onChange: onChangeRadio,
     value: valueRadio
   }, /*#__PURE__*/React.createElement(Radio, {
     value: "list"
-  }, "\u5217\u8868"), /*#__PURE__*/React.createElement(Radio, {
+  }, initLang({
+    id: "prompt.template.list"
+  })), /*#__PURE__*/React.createElement(Radio, {
     value: "cross"
-  }, "\u900F\u89C6\u8868")), /*#__PURE__*/React.createElement("div", {
+  }, initLang({
+    id: "prompt.template.cross"
+  }))), /*#__PURE__*/React.createElement(Popover, {
+    overlayClassName: "popover-sum-content",
+    content: /*#__PURE__*/React.createElement("div", {
+      className: "popover-sum-wrap"
+    }, sumEmnu.map(function (item) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "popover-sum-list",
+        key: item.value
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "popover-sum-title"
+      }, item.label), item.datas.map(function (d) {
+        return /*#__PURE__*/React.createElement("p", {
+          className: "popover-sum-li ".concat(sumColPosition === d.value || sumRow && d.value === "sumRow" ? "action" : ""),
+          key: d.value,
+          onClick: function onClick() {
+            handleSumType(item.value, d.value);
+          }
+        }, d.label);
+      }));
+    })),
+    trigger: "click",
+    placement: "bottom",
+    zIndex: 10000
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: initLang({
+      id: "list.column.summaryTitle"
+    })
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "icon-huizong",
+    style: {
+      cursor: "pointer",
+      color: sumColPosition ? "#0273b0" : ""
+    }
+  })))), /*#__PURE__*/React.createElement("div", {
     className: "dnd_quota_block_top",
     style: {
       marginTop: 4
     }
   }, /*#__PURE__*/React.createElement("p", {
     className: "dnd_quota_left-title"
-  }, "\u7EF4\u5EA6"), /*#__PURE__*/React.createElement("div", {
+  }, initLang({
+    id: "page.dimension"
+  })), /*#__PURE__*/React.createElement("div", {
     className: "dnd-quota-sortable-wrap dimension"
   }, /*#__PURE__*/React.createElement(ReactSortable, {
     tag: "div",
@@ -331,7 +462,9 @@ var Index = function Index(props, ref) {
     className: "dnd_quota_block_bottom"
   }, /*#__PURE__*/React.createElement("p", {
     className: "dnd_quota_left-title"
-  }, "\u5217"), /*#__PURE__*/React.createElement("div", {
+  }, initLang({
+    id: "brick.col"
+  })), /*#__PURE__*/React.createElement("div", {
     className: "dnd-quota-sortable-wrap list"
   }, /*#__PURE__*/React.createElement(ReactSortable, {
     tag: "div",
@@ -354,7 +487,9 @@ var Index = function Index(props, ref) {
     className: "dnd_quota_block_bottom"
   }, /*#__PURE__*/React.createElement("p", {
     className: "dnd_quota_left-title"
-  }, "\u6307\u6807"), /*#__PURE__*/React.createElement("div", {
+  }, initLang({
+    id: "page.quota"
+  })), /*#__PURE__*/React.createElement("div", {
     className: "dnd-quota-sortable-wrap quota"
   }, /*#__PURE__*/React.createElement(ReactSortable, {
     tag: "div",

package/dist/SubtotalsModal/index.d.ts

@@ -13,6 +13,7 @@ export interface SubtotalsModalProps {
     menuCode: string;
     formTemplateCode: string | undefined;
     commonRequest: any;
+    variablePara?: Record<string, any>;
 }
 declare const Index: React.FC<SubtotalsModalProps>;
 export default Index;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAMA;;GAEG;AAKH,OAAO,KAA2B,MAAM,OAAO,CAAC;AAChD,OAAO,4CAA4C,CAAC;AAMpD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IACjD,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;IAC7B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAE5C,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;CACpB;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAwJxC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AAMA;;GAEG;AAIH,OAAO,KAA2B,MAAM,OAAO,CAAC;AAChD,OAAO,4CAA4C,CAAC;AAOpD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IACjD,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;IAC7B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAE5C,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IAEnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAgKxC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/SubtotalsModal/index.js

@@ -16,10 +16,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { PlusOutlined } from "@ant-design/icons";
 import { Button, Popover, Tooltip } from "antd";
-import { initLang } from "../utils/language";
 import React, { useRef, useState } from "react";
 import "../../style/components/SubtotalsModal.scss";
 import ChooseModal from "../ChooseModal";
+import { initLang } from "../utils/language";
 import AddSubtotals from "./addSubtotals";
 import SubtotalTemplate from "./subtotalTemplate";
 import ViewSubtotals from "./viewSubtotals";
@@ -29,7 +29,8 @@ var Index = function Index(_ref) {
     onOk = _ref.onOk,
     menuCode = _ref.menuCode,
     formTemplateCode = _ref.formTemplateCode,
-    commonRequest = _ref.commonRequest;
+    commonRequest = _ref.commonRequest,
+    variablePara = _ref.variablePara;
   var modalRef = useRef();
   var addSubtotalsRef = useRef();
   var _useState = useState({}),
@@ -48,6 +49,10 @@ var Index = function Index(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     jsons = _useState8[0],
     setJsons = _useState8[1];
+  var _useState9 = useState(0),
+    _useState10 = _slicedToArray(_useState9, 2),
+    updateTable = _useState10[0],
+    setUpdateTable = _useState10[1];
   var handleAdd = function handleAdd() {
     setInitConfig({});
     setEditItem(null);
@@ -73,6 +78,9 @@ var Index = function Index(_ref) {
   // 预览
   var handleView = function handleView(str) {
     setJsons(str);
+    setUpdateTable(function (num) {
+      return num + 1;
+    });
   };
   // 返回
   var onCancel = function onCancel() {
@@ -88,6 +96,7 @@ var Index = function Index(_ref) {
     var _addSubtotalsRef$curr, _addSubtotalsRef$curr2;
     (_addSubtotalsRef$curr = addSubtotalsRef.current) === null || _addSubtotalsRef$curr === void 0 || (_addSubtotalsRef$curr2 = _addSubtotalsRef$curr.handleOk) === null || _addSubtotalsRef$curr2 === void 0 || _addSubtotalsRef$curr2.call(_addSubtotalsRef$curr);
   };
+  var onReset = function onReset() {};
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomRight",
     trigger: "click",
@@ -146,6 +155,7 @@ var Index = function Index(_ref) {
         initConfig: initConfig,
         editItem: editItem,
         handleView: handleView
+        // onReset={onReset}
       })), /*#__PURE__*/React.createElement("div", {
         className: "subtotals-modal-right"
       }, /*#__PURE__*/React.createElement("div", {
@@ -169,10 +179,12 @@ var Index = function Index(_ref) {
       }, initLang({
         id: "button.save"
       }))), /*#__PURE__*/React.createElement(ViewSubtotals, {
+        key: updateTable,
         jsons: jsons,
         columns: columns,
         formTemplateCode: formTemplateCode,
-        menuCode: menuCode
+        menuCode: menuCode,
+        variablePara: variablePara
       }))))), /*#__PURE__*/React.createElement(SubtotalTemplate, {
         key: updateTemplate,
         menuCode: menuCode,

package/dist/SubtotalsModal/viewSubtotals.d.ts

@@ -1,4 +1,5 @@
 import React from "react";
+import "../../style/components/SubtotalsModal.scss";
 interface Iprops {
     jsons: string;
     columns: Record<string, any>;

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;AAU5D,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;CACtC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CA6L3B,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;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;CACtC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CA6L3B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/SubtotalsModal/viewSubtotals.js

@@ -25,6 +25,7 @@ import React, { useEffect, useMemo, useState } from "react";
 import { queryData } from "../utils/services/global";
 // import { formatData } from '@/utils/utils';
 import { find, get } from "lodash";
+import "../../style/components/SubtotalsModal.scss";
 import { formatData } from "../utils/utils";
 import { getSummaryCol, loopColumns } from "./util";
 var Index = function Index(props) {

package/dist/TableHeaderConfigPopover/index.d.ts

@@ -9,6 +9,8 @@ interface Icolumns {
     handleBack?: () => void;
     handleSaveCallback?: () => void;
     newColumns?: any;
+    request: any;
+    saveColumn: any;
     crossQuery?: Boolean;
 }
 interface IProps extends Icolumns {

package/dist/TableHeaderConfigPopover/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,MAAO,SAAQ,QAAQ;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AAm6BD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAc3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.tsx"],"names":[],"mappings":"AA8BA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAKlE,OAAO,sDAAsD,CAAC;AAK9D,UAAU,QAAQ;IAChB,OAAO,EAAE,GAAG,CAAC;IACb,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IACtC,aAAa,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,IAAI,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,OAAO,EAAE,GAAG,CAAC;IACb,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AACD,UAAU,MAAO,SAAQ,QAAQ;IAC/B,QAAQ,EAAE,MAAM,CAAC;CAClB;AA6+BD,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAc3B,CAAC;AAEF,eAAe,KAAK,CAAC"}