ns-base-module 1.0.15 → 1.0.17

package/dist/SubtotalsModal/index.d.ts

@@ -14,6 +14,7 @@ export interface SubtotalsModalProps {
     formTemplateCode: string | undefined;
     commonRequest: any;
     variablePara?: Record<string, any>;
+    onChangeDuoQim?: 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;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"}
+{"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;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACtC;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAkKxC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/SubtotalsModal/index.js

@@ -30,7 +30,8 @@ var Index = function Index(_ref) {
     menuCode = _ref.menuCode,
     formTemplateCode = _ref.formTemplateCode,
     commonRequest = _ref.commonRequest,
-    variablePara = _ref.variablePara;
+    variablePara = _ref.variablePara,
+    onChangeDuoQim = _ref.onChangeDuoQim;
   var modalRef = useRef();
   var addSubtotalsRef = useRef();
   var _useState = useState({}),
@@ -191,7 +192,8 @@ var Index = function Index(_ref) {
         formTemplateCode: formTemplateCode,
         handleSet: handleSet,
         onOk: onOk,
-        commonRequest: commonRequest
+        commonRequest: commonRequest,
+        onChangeDuoQim: onChangeDuoQim
       }));
     }
   }, /*#__PURE__*/React.createElement(Tooltip, {

package/dist/SubtotalsModal/subtotalTemplate.d.ts

@@ -14,6 +14,7 @@ interface Iprops {
     menuCode: string;
     formTemplateCode: string | undefined;
     commonRequest: any;
+    onChangeDuoQim?: (values: Record<string, any>) => void;
 }
 declare const Index: React.FC<Iprops>;
 export default Index;

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

@@ -1 +1 @@
-{"version":3,"file":"subtotalTemplate.d.ts","sourceRoot":"","sources":["subtotalTemplate.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,OAAO,4CAA4C,CAAC;AAIpD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;CACnB;AAED,UAAU,MAAM;IACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IACjD,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAEnC,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,MAAM,CAqK3B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"subtotalTemplate.d.ts","sourceRoot":"","sources":["subtotalTemplate.tsx"],"names":[],"mappings":"AAMA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAGnD,OAAO,4CAA4C,CAAC;AAIpD,UAAU,KAAK;IACb,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAC;CACnB;AAED,UAAU,MAAM;IACd,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;IACjD,SAAS,EAAE,CAAC,MAAM,EAAE,KAAK,KAAK,IAAI,CAAC;IAEnC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAErC,aAAa,EAAE,GAAG,CAAC;IAEnB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;CACxD;AAED,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAgL3B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/dist/SubtotalsModal/subtotalTemplate.js

@@ -38,7 +38,9 @@ var Index = function Index(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     curItem = _useState6[0],
     setCurItem = _useState6[1];
-  console.log("commonRequest", commonRequest);
+
+  // console.log("commonRequest", commonRequest);
+
   var getTemplate = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res;
@@ -113,11 +115,13 @@ var Index = function Index(props) {
     // chartDimensions:[{"code":"aaaa"}]
     // chartQuotas:[{"code":"","sumType":"","expression":""}]
     try {
-      var _props$onOk;
+      var _props$onOk, _props$onChangeDuoQim;
       var chartDimensions = [];
       var chartQuotas = [];
       var chartColumns = [];
       var crossQuery = false;
+      var sumColPosition = null;
+      var sumRow = null;
       var val = typeof _value != "undefined" ? _value : value;
       var dimension = [];
       var quota = [];
@@ -141,6 +145,8 @@ var Index = function Index(props) {
             });
           });
           crossQuery = (_config === null || _config === void 0 ? void 0 : _config.valueRadio) === "cross";
+          sumColPosition = _config.sumColPosition;
+          sumRow = _config.sumRow;
           dimension = (_config$dimensionList = _config.dimensionList) === null || _config$dimensionList === void 0 ? void 0 : _config$dimensionList.map(function (d) {
             return d.value;
           });
@@ -154,8 +160,14 @@ var Index = function Index(props) {
         dimension: dimension,
         quota: quota
       });
-
-      // context.onChangeDuoQim?.({ chartDimensions, chartQuotas, chartColumns, crossQuery });
+      (_props$onChangeDuoQim = props.onChangeDuoQim) === null || _props$onChangeDuoQim === void 0 || _props$onChangeDuoQim.call(props, {
+        chartDimensions: chartDimensions,
+        chartQuotas: chartQuotas,
+        chartColumns: chartColumns,
+        crossQuery: crossQuery,
+        sumColPosition: sumColPosition,
+        sumRow: sumRow
+      });
     } catch (error) {
       console.log("errorerror", error);
     }

package/dist/SubtotalsModal/viewSubtotals.d.ts

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

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;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;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"}

package/dist/SubtotalsModal/viewSubtotals.js

@@ -31,7 +31,8 @@ import { getSummaryCol, loopColumns } from "./util";
 var Index = function Index(props) {
   var jsons = props.jsons,
     menuCode = props.menuCode,
-    formTemplateCode = props.formTemplateCode;
+    formTemplateCode = props.formTemplateCode,
+    variablePara = props.variablePara;
   var _useState = useState(1),
     _useState2 = _slicedToArray(_useState, 2),
     pageNum = _useState2[0],
@@ -106,11 +107,11 @@ var Index = function Index(props) {
 
   var getData = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var chartDimensions, chartQuotas, chartColumns, crossQuery, res, _res$data, code, data, _columns, arr;
+      var chartDimensions, chartQuotas, chartColumns, crossQuery, sumColPosition, sumRow, res, _res$data, code, data, _columns, arr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            chartDimensions = _ref.chartDimensions, chartQuotas = _ref.chartQuotas, chartColumns = _ref.chartColumns, crossQuery = _ref.crossQuery;
+            chartDimensions = _ref.chartDimensions, chartQuotas = _ref.chartQuotas, chartColumns = _ref.chartColumns, crossQuery = _ref.crossQuery, sumColPosition = _ref.sumColPosition, sumRow = _ref.sumRow;
             setLoading(true);
             _context.next = 4;
             return queryData({
@@ -120,11 +121,14 @@ var Index = function Index(props) {
               formTemplateCode: formTemplateCode,
               chartColumns: chartColumns,
               crossQuery: crossQuery,
+              sumColPosition: sumColPosition,
+              sumRow: sumRow,
               menuCode: menuCode,
               orderKey: "",
               orderType: "",
               pageNum: pageNum,
-              pageSize: pageSize
+              pageSize: pageSize,
+              variablePara: variablePara
             });
           case 4:
             res = _context.sent;
@@ -179,7 +183,9 @@ var Index = function Index(props) {
         chartDimensions: chartDimensions,
         chartQuotas: chartQuotas,
         chartColumns: chartColumns,
-        crossQuery: crossQuery
+        crossQuery: crossQuery,
+        sumColPosition: obj.sumColPosition || null,
+        sumRow: obj.sumRow || null
       });
     } catch (error) {}
   }, [jsons, menuCode, formTemplateCode, pageNum]);