@ztocwst/rc-pro-materials 0.2.24 → 0.2.26

package/es/components/z-templates-data-common/components/chart-renderer/index.js

@@ -29,6 +29,9 @@ var ChartRenderer = function ChartRenderer(_ref) {
       (_chartRef$current$act3 = _chartRef.current[activeKey]) === null || _chartRef$current$act3 === void 0 ? void 0 : (_chartRef$current$act4 = _chartRef$current$act3.queryChart) === null || _chartRef$current$act4 === void 0 ? void 0 : _chartRef$current$act4.call(_chartRef$current$act3, values);
     }
   };
+  var getCurrentKey = function getCurrentKey() {
+    return activeKey;
+  };
   useEffect(function () {
     if (isObject && ! /*#__PURE__*/React.isValidElement(chartSetting)) {
       setActiveKey(chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName);
@@ -49,7 +52,8 @@ var ChartRenderer = function ChartRenderer(_ref) {
   useImperativeHandle(chartRenderRef, function () {
     return {
       onLink: onLink,
-      queryChart: queryChart
+      queryChart: queryChart,
+      getCurrentKey: getCurrentKey
     };
   });
 

package/es/components/z-templates-data-common/data-common.js

@@ -58,6 +58,10 @@ var ZTemplatesDataCommon = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  var getCurrentKey = function getCurrentKey() {
+    var _chartRenderRef$curre, _chartRenderRef$curre2;
+    return (_chartRenderRef$curre = chartRenderRef.current) === null || _chartRenderRef$curre === void 0 ? void 0 : (_chartRenderRef$curre2 = _chartRenderRef$curre.getCurrentKey) === null || _chartRenderRef$curre2 === void 0 ? void 0 : _chartRenderRef$curre2.call(_chartRenderRef$curre);
+  };
   var onConfirm = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var values;
@@ -87,19 +91,20 @@ var ZTemplatesDataCommon = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
   }();
   var onLink = function onLink(values) {
-    var _chartRenderRef$curre, _chartRenderRef$curre2;
-    return (_chartRenderRef$curre = chartRenderRef.current) === null || _chartRenderRef$curre === void 0 ? void 0 : (_chartRenderRef$curre2 = _chartRenderRef$curre.onLink) === null || _chartRenderRef$curre2 === void 0 ? void 0 : _chartRenderRef$curre2.call(_chartRenderRef$curre, values);
+    var _chartRenderRef$curre3, _chartRenderRef$curre4;
+    return (_chartRenderRef$curre3 = chartRenderRef.current) === null || _chartRenderRef$curre3 === void 0 ? void 0 : (_chartRenderRef$curre4 = _chartRenderRef$curre3.onLink) === null || _chartRenderRef$curre4 === void 0 ? void 0 : _chartRenderRef$curre4.call(_chartRenderRef$curre3, values);
   };
   useImperativeHandle(ref, function () {
     return {
       formRef: formRef,
       onLink: onLink,
       onQueryValues: onQueryValues,
-      onQueryFormatValues: onQueryFormatValues
+      onQueryFormatValues: onQueryFormatValues,
+      getCurrentKey: getCurrentKey
     };
   });
   var formProps = processFormProps(querySetting);
-  console.log("formProps", formProps);
+  // console.log(`formProps`, formProps);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ProFormRender, _extends({}, formProps, {
     formRef: formRef,
     onFinish: /*#__PURE__*/function () {

package/es/style.js

@@ -6,11 +6,11 @@ import 'antd/lib/config-provider/style';
 import 'antd/es/config-provider/style';
 import 'antd/lib/row/style';
 import 'antd/lib/col/style';
-import 'antd/lib/message/style';
-import 'antd/lib/tabs/style';
 import 'antd/lib/checkbox/style';
 import 'antd/lib/spin/style';
 import 'antd/lib/radio/style';
+import 'antd/lib/message/style';
+import 'antd/lib/tabs/style';
 import 'antd/lib/carousel/style';
 import 'antd/es/statistic/style';
 import 'antd/es/progress/style';

package/lib/components/z-data-table/components/custom-renderer/index.js

@@ -45,80 +45,110 @@ var CustomRenderer = function CustomRenderer(props) {
     setIsLink(true);
     (_linkChartRef$current = linkChartRef.current) === null || _linkChartRef$current === void 0 ? void 0 : (_linkChartRef$current2 = _linkChartRef$current.initial) === null || _linkChartRef$current2 === void 0 ? void 0 : _linkChartRef$current2.call(_linkChartRef$current, (0, _extends2["default"])({}, values));
   };
+  var getBigDataBody = function getBigDataBody(params) {
+    var _indexJson$data;
+    if (params === void 0) {
+      params = {};
+    }
+    var target = [];
+    if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
+      for (var _iterator = _createForOfIteratorHelperLoose(indexJson.data), _step; !(_step = _iterator()).done;) {
+        var item = _step.value;
+        target.push({
+          description: item.name
+        });
+      }
+    }
+    var queryParams = (0, _dataTable.handleQueryParams)(params);
+    var data = {
+      target: target,
+      queryParams: queryParams,
+      dataSetName: dataSetName
+    };
+    return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;
+  };
 
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(query) {
-      var _indexJson$data, target, _iterator, _step, item, queryParams, data, res;
+      var data, _ref3, success, _ref3$result, _result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (query === void 0) {
               query = {};
             }
-            _context.prev = 1;
-            target = [];
-            if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
-              for (_iterator = _createForOfIteratorHelperLoose(indexJson.data); !(_step = _iterator()).done;) {
-                item = _step.value;
-                target.push({
-                  description: item.name
-                });
-              }
+            if (!loading) {
+              _context.next = 3;
+              break;
             }
-            queryParams = (0, _dataTable.handleQueryParams)(query);
-            data = {
-              target: target,
-              queryParams: queryParams,
-              dataSetName: dataSetName
-            };
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(query);
             setLoading(true);
-            _context.next = 9;
-            return (0, _dataTable.getReportData)(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
-          case 9:
-            res = _context.sent;
+            _context.next = 8;
+            return (0, _dataTable.getReportData)(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref3 = _context.t0;
+            success = _ref3.success;
+            _ref3$result = _ref3.result;
+            _result = _ref3$result === void 0 ? {} : _ref3$result;
             setLoading(false);
-            if (res !== null && res !== void 0 && res.success) {
-              setResult(res === null || res === void 0 ? void 0 : res.result);
+            if (success) {
+              setResult(_result);
+            } else {
+              setResult(null);
             }
-            _context.next = 19;
+            _context.next = 24;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](1);
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](3);
             setLoading(false);
             setResult(null);
-            console.error(_context.t0);
-          case 19:
+            console.error(_context.t1);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 14]]);
+      }, _callee, null, [[3, 19]]);
     }));
     return function getDataSource(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   var queryChart = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
-      var queryParams, _linkChartRef$current3;
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
+      var _value;
+      var queryParams, _linkChartRef$current3, _linkChartRef$current4;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            queryParams = value[dataSetName] || value;
+            if (value === void 0) {
+              value = {};
+            }
+            queryParams = ((_value = value) === null || _value === void 0 ? void 0 : _value[dataSetName]) || value;
             if (isLink) {
-              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : _linkChartRef$current3.queryChart(queryParams);
+              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : (_linkChartRef$current4 = _linkChartRef$current3.queryChart) === null || _linkChartRef$current4 === void 0 ? void 0 : _linkChartRef$current4.call(_linkChartRef$current3, queryParams);
             } else {
               getDataSource(queryParams);
             }
-          case 2:
+          case 3:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function queryChart(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var handleClearInterval = function handleClearInterval() {
@@ -143,8 +173,8 @@ var CustomRenderer = function CustomRenderer(props) {
   };
   (0, _react.useEffect)(function () {
     if (currentKey) {
-      var _ref4 = currentKey.split(_dataTable.separator) || [],
-        curDataSetName = _ref4[0];
+      var _ref5 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref5[0];
       if (curDataSetName === dataSetName) {
         onload();
       } else {

package/lib/components/z-data-table/components/link-renderer/index.js

@@ -245,42 +245,57 @@ var LinkRenderer = function LinkRenderer(props) {
   };
   var getDataSource = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
-      var queryData;
+      var data, _ref5, success, _ref5$result, _result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (params === void 0) {
               params = {};
             }
-            queryData = getBigDataBody(params);
+            if (!loading) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(params); // 自定义、非自定义都打开 loading 拦截重复请求
+            setLoading(true);
+            _context.next = 8;
+            return (0, _dataTable.getReportData)(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref5 = _context.t0;
+            success = _ref5.success;
+            _ref5$result = _ref5.result;
+            _result = _ref5$result === void 0 ? {} : _ref5$result;
+            setLoading(false);
             if (linkState.custom) {
-              setLoading(true);
+              setResult(_result);
             }
-            return _context.abrupt("return", (0, _dataTable.getReportData)(rcProContext, queryData).then(function (_ref5) {
-              var success = _ref5.success,
-                _ref5$result = _ref5.result,
-                result = _ref5$result === void 0 ? {} : _ref5$result;
-              if (linkState.custom) {
-                setLoading(false);
-                if (success) {
-                  setResult(result);
-                }
-              }
-              return {
-                success: success,
-                result: result
-              };
-            })["catch"](function () {
-              if (linkState.custom) {
-                setLoading(false);
-                setResult(null);
-              }
-            }));
-          case 4:
+            return _context.abrupt("return", {
+              success: success,
+              result: _result
+            });
+          case 20:
+            _context.prev = 20;
+            _context.t1 = _context["catch"](3);
+            setLoading(false);
+            if (linkState.custom) {
+              setResult(null);
+            }
+            console.error(_context.t1);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[3, 20]]);
     }));
     return function getDataSource(_x) {
       return _ref4.apply(this, arguments);
@@ -339,6 +354,9 @@ var LinkRenderer = function LinkRenderer(props) {
     setLinkState(stateData);
   };
   var queryChart = function queryChart(value) {
+    if (value === void 0) {
+      value = {};
+    }
     queryCacheRef.current = value;
     if (linkState.custom) {
       getDataSource({