@ztocwst/rc-pro-materials 0.2.24 → 0.2.26

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

@@ -28,6 +28,7 @@ var TableRenderer = function TableRenderer(props) {
     remember = props.remember,
     exporter = props.exporter,
     exportConfig = props.exportConfig,
+    confirmConfig = props.confirmConfig,
     dimJson = props.dimJson,
     indexJson = props.indexJson,
     actionJson = props.actionJson,
@@ -44,13 +45,10 @@ var TableRenderer = function TableRenderer(props) {
   var _useState = (0, _react.useState)(false),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(_dataTable.tableConfigDefault),
-    config = _useState2[0],
-    setConfig = _useState2[1];
   /** 维度指标初始数据 */
-  var _useState3 = (0, _react.useState)(),
-    dimTargetValue = _useState3[0],
-    setDimTargetValue = _useState3[1];
+  var _useState2 = (0, _react.useState)(),
+    dimTargetValue = _useState2[0],
+    setDimTargetValue = _useState2[1];
   /** 合计 数据 */
   var amounted = (0, _react.useRef)({});
   var rcProContext = (0, _react.useContext)(_rcPro.RcConfigContext);
@@ -59,25 +57,28 @@ var TableRenderer = function TableRenderer(props) {
     _ref$tableOptions = _ref.tableOptions,
     tableOptions = _ref$tableOptions === void 0 ? {} : _ref$tableOptions;
   var defaultPageSize = (tableOptions === null || tableOptions === void 0 ? void 0 : (_tableOptions$paginat = tableOptions.pagination) === null || _tableOptions$paginat === void 0 ? void 0 : _tableOptions$paginat.defaultPageSize) || 20;
-  var _useState4 = (0, _react.useState)(false),
-    isLink = _useState4[0],
-    setIsLink = _useState4[1];
+  var _useState3 = (0, _react.useState)(false),
+    isLink = _useState3[0],
+    setIsLink = _useState3[1];
   var linkChartRef = (0, _react.useRef)();
   var timer = null;
+  var timeout = null;
   var getDimTargetValues = function getDimTargetValues() {
     var _dimTargetRef$current;
     return (dimTargetRef === null || dimTargetRef === void 0 ? void 0 : (_dimTargetRef$current = dimTargetRef.current) === null || _dimTargetRef$current === void 0 ? void 0 : _dimTargetRef$current.getDimTargetValues()) || {};
   };
   var buttons = [{
-    name: '确认',
+    name: confirmConfig === null || confirmConfig === void 0 ? void 0 : confirmConfig.name,
     action: 'btn',
     props: {
       loading: loading,
       type: 'primary'
     },
     onClick: function onClick() {
+      var _confirmConfig$onClic;
       var option = getDimTargetValues();
       handleUpdateColumns(option);
+      confirmConfig === null || confirmConfig === void 0 ? void 0 : (_confirmConfig$onClic = confirmConfig.onClick) === null || _confirmConfig$onClic === void 0 ? void 0 : _confirmConfig$onClic.call(confirmConfig);
       onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
     }
   }, exporter ? {
@@ -160,27 +161,13 @@ var TableRenderer = function TableRenderer(props) {
       dimension: dimension
     }));
   };
-  var handleUpdateColumns = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(option) {
-      var _tableRef$current;
-      var columns;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            columns = (0, _tableRenderer.handleColumns)((0, _extends2["default"])({}, option, {
-              actionJson: actionJson
-            }), expressions, linkPage, onLink);
-            (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.updateColumns(columns);
-          case 2:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function handleUpdateColumns(_x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+  var handleUpdateColumns = function handleUpdateColumns(option) {
+    var _tableRef$current;
+    var columns = (0, _tableRenderer.handleColumns)((0, _extends2["default"])({}, option, {
+      actionJson: actionJson
+    }), expressions, linkPage, onLink);
+    (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : _tableRef$current.updateColumns(columns);
+  };
   var getBigDataBody = function getBigDataBody(params) {
     if (params === void 0) {
       params = {};
@@ -301,57 +288,64 @@ var TableRenderer = function TableRenderer(props) {
 
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
-      var data, _yield$getReportData, success, _yield$getReportData$, result;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(params) {
+      var data, _ref4, success, _ref4$result, result;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             if (params === void 0) {
               params = {};
             }
             if (!loading) {
-              _context3.next = 3;
+              _context2.next = 3;
               break;
             }
-            return _context3.abrupt("return");
+            return _context2.abrupt("return");
           case 3:
-            _context3.prev = 3;
+            _context2.prev = 3;
             data = getBigDataBody(params);
             setLoading(true);
-            _context3.next = 8;
+            _context2.next = 8;
             return (0, _dataTable.getReportData)(rcProContext, data);
           case 8:
-            _yield$getReportData = _context3.sent;
-            success = _yield$getReportData.success;
-            _yield$getReportData$ = _yield$getReportData.result;
-            result = _yield$getReportData$ === void 0 ? {} : _yield$getReportData$;
+            _context2.t0 = _context2.sent;
+            if (_context2.t0) {
+              _context2.next = 11;
+              break;
+            }
+            _context2.t0 = {};
+          case 11:
+            _ref4 = _context2.t0;
+            success = _ref4.success;
+            _ref4$result = _ref4.result;
+            result = _ref4$result === void 0 ? {} : _ref4$result;
             setLoading(false);
-            return _context3.abrupt("return", {
+            return _context2.abrupt("return", {
               success: success,
               result: result
             });
-          case 16:
-            _context3.prev = 16;
-            _context3.t0 = _context3["catch"](3);
+          case 19:
+            _context2.prev = 19;
+            _context2.t1 = _context2["catch"](3);
             setLoading(false);
-            console.error(_context3.t0);
-          case 20:
+            console.error(_context2.t1);
+          case 23:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, null, [[3, 16]]);
+      }, _callee2, null, [[3, 19]]);
     }));
-    return function getDataSource(_x3) {
-      return _ref4.apply(this, arguments);
+    return function getDataSource(_x2) {
+      return _ref3.apply(this, arguments);
     };
   }();
   var initial = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(params) {
+    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
       var result, dims, targets, option;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context4.next = 2;
+            _context3.next = 2;
             return (0, _tableRenderer.getDimTargetData)(rcProContext, (0, _extends2["default"])({
               dataSetName: dataSetName
             }, params), {
@@ -359,7 +353,7 @@ var TableRenderer = function TableRenderer(props) {
               indexJson: indexJson
             });
           case 2:
-            result = _context4.sent;
+            result = _context3.sent;
             if (result) {
               dims = result.dims, targets = result.targets;
               option = {
@@ -370,39 +364,14 @@ var TableRenderer = function TableRenderer(props) {
               };
               handleUpdateColumns(option);
               setDimTargetValue(result);
-              setConfig((0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
-                pagination: {
-                  showSizeChanger: true,
-                  defaultPageSize: defaultPageSize
-                },
-                summary: summary,
-                request: function request(data) {
-                  var _data$pagination, _data$pagination2, _data$sorter;
-                  var pagination = {
-                    pageNum: (_data$pagination = data.pagination) === null || _data$pagination === void 0 ? void 0 : _data$pagination.current,
-                    pageSize: (_data$pagination2 = data.pagination) === null || _data$pagination2 === void 0 ? void 0 : _data$pagination2.pageSize
-                  };
-                  var orderBy = [];
-                  if ((_data$sorter = data.sorter) !== null && _data$sorter !== void 0 && _data$sorter.order) {
-                    var _data$sorter2, _data$sorter3, _data$sorter3$order;
-                    orderBy.push({
-                      name: (_data$sorter2 = data.sorter) === null || _data$sorter2 === void 0 ? void 0 : _data$sorter2.field,
-                      sort: (_data$sorter3 = data.sorter) === null || _data$sorter3 === void 0 ? void 0 : (_data$sorter3$order = _data$sorter3.order) === null || _data$sorter3$order === void 0 ? void 0 : _data$sorter3$order.slice(0, -3)
-                    });
-                  }
-                  return getDataSource((0, _extends2["default"])({}, pagination, {
-                    orderBy: orderBy
-                  }));
-                }
-              }));
             }
           case 4:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4);
+      }, _callee3);
     }));
-    return function initial(_x4) {
+    return function initial(_x3) {
       return _ref5.apply(this, arguments);
     };
   }();
@@ -417,6 +386,12 @@ var TableRenderer = function TableRenderer(props) {
       timer = null;
     }
   };
+  var handleClearTimeout = function handleClearTimeout() {
+    if (timeout) {
+      clearTimeout(timeout);
+      timeout = null;
+    }
+  };
   var onload = function onload() {
     if (autoLoad) {
       if (refreshRate) {
@@ -448,20 +423,23 @@ var TableRenderer = function TableRenderer(props) {
     };
   }, [currentKey, autoLoad]);
   var queryChart = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(value) {
-      var _linkChartRef$current3;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(value) {
+      var _linkChartRef$current3, _value;
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
+            if (value === void 0) {
+              value = {};
+            }
             if (isLink) {
               (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : _linkChartRef$current3.queryChart(value);
             } else {
-              queryCacheRef.current = value[dataSetName] || value;
-              setTimeout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+              queryCacheRef.current = ((_value = value) === null || _value === void 0 ? void 0 : _value[dataSetName]) || value;
+              timeout = window.setTimeout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
                 var _tableRef$current2;
                 var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator4, _step4, cur, _ref9, success, _ref9$result, result, _result$data, _result$data$, data;
-                return _regenerator["default"].wrap(function _callee5$(_context5) {
-                  while (1) switch (_context5.prev = _context5.next) {
+                return _regenerator["default"].wrap(function _callee4$(_context4) {
+                  while (1) switch (_context4.prev = _context4.next) {
                     case 0:
                       (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : _tableRef$current2.refreshTable({
                         current: 1
@@ -471,7 +449,7 @@ var TableRenderer = function TableRenderer(props) {
                         return cur.amounted;
                       });
                       if (!(indexAmounted !== null && indexAmounted !== void 0 && indexAmounted.length)) {
-                        _context5.next = 16;
+                        _context4.next = 16;
                         break;
                       }
                       target = [];
@@ -481,20 +459,20 @@ var TableRenderer = function TableRenderer(props) {
                           description: cur.name
                         });
                       }
-                      _context5.next = 8;
+                      _context4.next = 8;
                       return getDataSource({
                         dim: [],
                         target: target
                       });
                     case 8:
-                      _context5.t0 = _context5.sent;
-                      if (_context5.t0) {
-                        _context5.next = 11;
+                      _context4.t0 = _context4.sent;
+                      if (_context4.t0) {
+                        _context4.next = 11;
                         break;
                       }
-                      _context5.t0 = {};
+                      _context4.t0 = {};
                     case 11:
-                      _ref9 = _context5.t0;
+                      _ref9 = _context4.t0;
                       success = _ref9.success;
                       _ref9$result = _ref9.result;
                       result = _ref9$result === void 0 ? {} : _ref9$result;
@@ -503,19 +481,21 @@ var TableRenderer = function TableRenderer(props) {
                         amounted.current = data;
                       }
                     case 16:
+                      handleClearTimeout();
+                    case 17:
                     case "end":
-                      return _context5.stop();
+                      return _context4.stop();
                   }
-                }, _callee5);
+                }, _callee4);
               })), 200);
             }
-          case 1:
+          case 2:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
-    return function queryChart(_x5) {
+    return function queryChart(_x4) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -539,7 +519,31 @@ var TableRenderer = function TableRenderer(props) {
     })
   }), /*#__PURE__*/React.createElement(_rcPro.ProTable, {
     ref: tableRef,
-    config: config
+    config: (0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
+      pagination: {
+        showSizeChanger: true,
+        defaultPageSize: defaultPageSize
+      },
+      summary: summary,
+      request: function request(data) {
+        var _data$pagination, _data$pagination2, _data$sorter;
+        var pagination = {
+          pageNum: (_data$pagination = data.pagination) === null || _data$pagination === void 0 ? void 0 : _data$pagination.current,
+          pageSize: (_data$pagination2 = data.pagination) === null || _data$pagination2 === void 0 ? void 0 : _data$pagination2.pageSize
+        };
+        var orderBy = [];
+        if ((_data$sorter = data.sorter) !== null && _data$sorter !== void 0 && _data$sorter.order) {
+          var _data$sorter2, _data$sorter3, _data$sorter3$order;
+          orderBy.push({
+            name: (_data$sorter2 = data.sorter) === null || _data$sorter2 === void 0 ? void 0 : _data$sorter2.field,
+            sort: (_data$sorter3 = data.sorter) === null || _data$sorter3 === void 0 ? void 0 : (_data$sorter3$order = _data$sorter3.order) === null || _data$sorter3$order === void 0 ? void 0 : _data$sorter3$order.slice(0, -3)
+          });
+        }
+        return getDataSource((0, _extends2["default"])({}, pagination, {
+          orderBy: orderBy
+        }));
+      }
+    })
   })), /*#__PURE__*/React.createElement("div", {
     style: {
       display: isLink ? 'block' : 'none'

package/lib/components/z-data-table/data-table.d.ts

@@ -63,8 +63,6 @@ export interface TypeZDataTableProps {
     refreshRate?: number;
     /** 记住勾选 */
     remember?: boolean;
-    /** 导出 */
-    exporter?: boolean;
     /** 操作列(表头)配置 */
     actionJson?: {
         /** 表头名称 */
@@ -80,6 +78,12 @@ export interface TypeZDataTableProps {
         /** 自定义渲染方法 */
         render?: (p: any) => React.ReactNode;
     };
+    confirmConfig?: {
+        name?: string;
+        onClick?: () => void;
+    };
+    /** 导出 */
+    exporter?: boolean;
     /** 导出配置 */
     exportConfig?: {
         name: string;

package/lib/components/z-data-table/data-table.helper.js

@@ -193,7 +193,7 @@ var handleCondition = function handleCondition(value, handledValue, conditions)
 
 // mock
 exports.handleCondition = handleCondition;
-var token = 'scm:tenant:token:2:104:CCAB6974939D70D8418CBEC342EAE22D';
+var token = 'scm:tenant:token:2:104:7c454641-c65c-4459-b5a3-d4be9fb16ffd';
 
 /** 获取维度指标 */
 var getDimTarget = /*#__PURE__*/function () {

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

@@ -36,6 +36,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;
+  };
   (0, _react.useEffect)(function () {
     if (isObject && ! /*#__PURE__*/_react["default"].isValidElement(chartSetting)) {
       setActiveKey(chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName);
@@ -56,7 +59,8 @@ var ChartRenderer = function ChartRenderer(_ref) {
   (0, _react.useImperativeHandle)(chartRenderRef, function () {
     return {
       onLink: onLink,
-      queryChart: queryChart
+      queryChart: queryChart,
+      getCurrentKey: getCurrentKey
     };
   });
 

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

@@ -65,6 +65,10 @@ var ZTemplatesDataCommon = /*#__PURE__*/_react["default"].forwardRef(function (p
       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 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
       var values;
@@ -94,19 +98,20 @@ var ZTemplatesDataCommon = /*#__PURE__*/_react["default"].forwardRef(function (p
     };
   }();
   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);
   };
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       formRef: formRef,
       onLink: onLink,
       onQueryValues: onQueryValues,
-      onQueryFormatValues: onQueryFormatValues
+      onQueryFormatValues: onQueryFormatValues,
+      getCurrentKey: getCurrentKey
     };
   });
   var formProps = (0, _utils.processFormProps)(querySetting);
-  console.log("formProps", formProps);
+  // console.log(`formProps`, formProps);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_rcPro.ProFormRender, (0, _extends2["default"])({}, formProps, {
     formRef: formRef,
     onFinish: /*#__PURE__*/function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -22,7 +22,6 @@
     "f2elint-fix": "f2elint fix",
     "dumi": "cross-env APP_ROOT=docs dumi dev",
     "dumi:build": "cross-env APP_ROOT=docs dumi build",
-    "prepublishOnly": "npm run build && npm run lowcode:build",
     "ding": "node ./scripts/notify",
     "postpublish": "npm run ding"
   },
@@ -86,11 +85,11 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.24/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.26/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.24/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.26/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   }
-}
+}