@ztocwst/rc-pro-materials 0.2.23 → 0.2.25

package/lib/components/{z-templates-data-common → z-data-table}/components/dim-target/index.js

@@ -10,7 +10,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
 var _rcPro = require("@ztocwst/rc-pro");
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _useUpdateEffect = _interopRequireDefault(require("./useUpdateEffect"));
 require("./index.less");
 var _excluded = ["checked"],
@@ -69,7 +69,7 @@ var DimTarget = function DimTarget(_ref) {
       var _item = _step2.value;
       dimensionIndex.push(_item.name);
     }
-    setDimTargetWidth((0, _dataCommon.getMaxWidth)(dimensionIndex));
+    setDimTargetWidth((0, _dataTable.getMaxWidth)(dimensionIndex));
     setDims((0, _extends2["default"])({}, DimsDefault, value === null || value === void 0 ? void 0 : value.dims));
     setTargets((0, _extends2["default"])({}, TargetsDefault, value === null || value === void 0 ? void 0 : value.targets));
     setRememberCheck(value === null || value === void 0 ? void 0 : value.rememberCheck);
@@ -338,7 +338,7 @@ var DimTarget = function DimTarget(_ref) {
             };
             _context.prev = 8;
             _context.next = 11;
-            return (0, _dataCommon.saveDimTarget)(rcProContext, data);
+            return (0, _dataTable.saveDimTarget)(rcProContext, data);
           case 11:
             _context.next = 16;
             break;

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

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import type { CheckboxValueType } from 'antd/es/checkbox/Group';
+import type { TypeZDataTableProps } from '../../data-table';
+import './index.less';
+export interface linkParamsType extends Pick<TypeZDataTableProps, 'dataSetName'> {
+    index?: number | string;
+    width?: number;
+    dimension?: CheckboxValueType[];
+    record?: Record<string, any>;
+}
+export interface linkStateType extends linkParamsType, Pick<TypeZDataTableProps, 'chartTitle' | 'custom' | 'child' | 'title' | 'autoLoad' | 'refreshRate' | 'actionJson' | 'exporter' | 'exportConfig'> {
+}
+declare const LinkRenderer: (props: Pick<TypeZDataTableProps, "onConfirm" | "dimJson" | "linkPage" | "linkPageTitle" | "chartRef"> & {
+    onBack?: () => void;
+}) => import("react").JSX.Element;
+export default LinkRenderer;

package/lib/components/{z-templates-data-common → z-data-table}/components/link-renderer/index.js

@@ -13,7 +13,7 @@ var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
 var _icons = require("@ant-design/icons");
 var _moment = _interopRequireDefault(require("moment"));
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _tableRenderer = require("../table-renderer/table-renderer.helper");
 require("./index.less");
 var _excluded = ["queryBind", "formatter"],
@@ -77,7 +77,7 @@ var LinkRenderer = function LinkRenderer(props) {
           handleClearInterval();
           timer = window.setInterval(function () {
             return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-          }, refreshRate * _dataCommon.timeUnit);
+          }, refreshRate * _dataTable.timeUnit);
         } else {
           onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
         }
@@ -130,7 +130,7 @@ var LinkRenderer = function LinkRenderer(props) {
       find = (0, _objectWithoutPropertiesLoose2["default"])(_linkPage$index, _excluded);
     var _ref3 = (0, _tableRenderer.handleDimTargetFormat)(find) || {},
       targets = _ref3.targets;
-    var queryCache = queryCacheRef.current;
+    var queryCache = queryCacheRef.current || {};
     var query = {};
     var queryKeys = Object.keys(queryCache);
     if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
@@ -148,10 +148,10 @@ var LinkRenderer = function LinkRenderer(props) {
             var value = queryCache[k];
             if (key) {
               // 类型为时间时 处理
-              if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+              if ((0, _dataTable.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
                 return (0, _moment["default"])(d).isValid();
               })) {
-                var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
+                var i = key.includes(_dataTable.dateStart) ? 0 : 1;
                 query[key] = value[i];
               } else {
                 query[key] = value;
@@ -202,12 +202,12 @@ var LinkRenderer = function LinkRenderer(props) {
         if (cur !== null && cur !== void 0 && cur.sorted) {
           orderBys.push({
             name: cur.name,
-            sort: _dataCommon.defaultSort
+            sort: _dataTable.defaultSort
           });
         }
       }
     }
-    var queryParams = (0, _dataCommon.handleQueryParams)(query);
+    var queryParams = (0, _dataTable.handleQueryParams)(query);
     var _params = params,
       pageNum = _params.pageNum,
       pageSize = _params.pageSize,
@@ -256,7 +256,7 @@ var LinkRenderer = function LinkRenderer(props) {
             if (linkState.custom) {
               setLoading(true);
             }
-            return _context.abrupt("return", (0, _dataCommon.getReportData)(rcProContext, queryData).then(function (_ref5) {
+            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;
@@ -312,7 +312,7 @@ var LinkRenderer = function LinkRenderer(props) {
         linkTitle.push(item.title);
       }
     }
-    var width = (0, _dataCommon.getMaxWidth)(linkTitle);
+    var width = (0, _dataTable.getMaxWidth)(linkTitle);
 
     /** 二级页出现重复相同的时候 索引未配置正确 取dataSetName 出现最近一次下标 防止报错 */
     if (!isNumber || isNumber && (index < 0 || index >= Length)) {
@@ -330,7 +330,7 @@ var LinkRenderer = function LinkRenderer(props) {
       index: index
     });
     /** 当前进入与上次进入link页不同时需要清空数据 */
-    var isSource = "" + paramsState.dataSetName + _dataCommon.separator + index === "" + linkState.dataSetName + _dataCommon.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
+    var isSource = "" + paramsState.dataSetName + _dataTable.separator + index === "" + linkState.dataSetName + _dataTable.separator + (linkState === null || linkState === void 0 ? void 0 : linkState.index);
     var isSame = JSON.stringify(paramsState === null || paramsState === void 0 ? void 0 : paramsState.record) === JSON.stringify(linkState === null || linkState === void 0 ? void 0 : linkState.record);
     if (!currentState.custom && (!isSource || !isSame)) {
       var _tableRef$current2, _tableRef$current2$up;
@@ -363,7 +363,7 @@ var LinkRenderer = function LinkRenderer(props) {
   var handleLinkChange = function handleLinkChange(event) {
     var value = event.target.value;
     // dataSetName 可能会重复配置 所以使用 dataSetName + 分隔符 + index
-    var _ref7 = (value === null || value === void 0 ? void 0 : value.split(_dataCommon.separator)) || [],
+    var _ref7 = (value === null || value === void 0 ? void 0 : value.split(_dataTable.separator)) || [],
       dataSetName = _ref7[0],
       index = _ref7[1];
     var currentState = linkPage[index];
@@ -383,12 +383,12 @@ var LinkRenderer = function LinkRenderer(props) {
   }), /*#__PURE__*/React.createElement("span", null, linkState.chartTitle || linkPageTitle)), (linkPage === null || linkPage === void 0 ? void 0 : (_linkPage$filter = linkPage.filter(function (field) {
     return (field === null || field === void 0 ? void 0 : field.dataSetName) === linkState.dataSetName && (field === null || field === void 0 ? void 0 : field.chartTitle) === linkState.chartTitle;
   })) === null || _linkPage$filter === void 0 ? void 0 : _linkPage$filter.length) <= 1 ? null : /*#__PURE__*/React.createElement(_radio["default"].Group, {
-    value: "" + (linkState === null || linkState === void 0 ? void 0 : linkState.dataSetName) + _dataCommon.separator + linkState.index,
+    value: "" + (linkState === null || linkState === void 0 ? void 0 : linkState.dataSetName) + _dataTable.separator + linkState.index,
     onChange: handleLinkChange
   }, linkPage === null || linkPage === void 0 ? void 0 : linkPage.map(function (field, index) {
     return (field === null || field === void 0 ? void 0 : field.dataSetName) === linkState.dataSetName && (field === null || field === void 0 ? void 0 : field.chartTitle) === linkState.chartTitle ? /*#__PURE__*/React.createElement(_radio["default"].Button, {
-      value: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataCommon.separator + index.toString(),
-      key: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataCommon.separator + index.toString()
+      value: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataTable.separator + index.toString(),
+      key: "" + (field === null || field === void 0 ? void 0 : field.dataSetName) + _dataTable.separator + index.toString()
     }, /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'center',
@@ -401,6 +401,9 @@ var LinkRenderer = function LinkRenderer(props) {
     items: [{
       action: 'btn',
       name: linkState === null || linkState === void 0 ? void 0 : linkState.exportConfig.name,
+      props: {
+        disabled: !queryCacheRef.current
+      },
       fileConfig: {
         type: 'export',
         params: {
@@ -443,7 +446,7 @@ var LinkRenderer = function LinkRenderer(props) {
     spinning: loading
   }, (_linkState$child = linkState.child) === null || _linkState$child === void 0 ? void 0 : _linkState$child.call(linkState, result)) : /*#__PURE__*/React.createElement(_rcPro.ProTable, {
     ref: tableRef,
-    config: (0, _extends2["default"])({}, _dataCommon.tableConfigDefault, {
+    config: (0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
       pagination: {
         showSizeChanger: true,
         defaultPageSize: defaultPageSize

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

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { TypeZDataTableProps } from '../../data-table';
+declare const TableRenderer: (props: TypeZDataTableProps) => import("react").JSX.Element;
+export default TableRenderer;

package/lib/components/{z-templates-data-common → z-data-table}/components/table-renderer/index.js

@@ -11,7 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
 var _moment = _interopRequireDefault(require("moment"));
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _tableRenderer = require("./table-renderer.helper");
 var _dimTarget = _interopRequireDefault(require("../dim-target"));
 var _linkRenderer = _interopRequireDefault(require("../link-renderer"));
@@ -21,13 +21,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var TableRenderer = function TableRenderer(props) {
   var _tableOptions$paginat;
-  var activeKey = props.activeKey,
+  var currentKey = props.currentKey,
     autoLoad = props.autoLoad,
     refreshRate = props.refreshRate,
     dataSetName = props.dataSetName,
     remember = props.remember,
     exporter = props.exporter,
     exportConfig = props.exportConfig,
+    confirmConfig = props.confirmConfig,
     dimJson = props.dimJson,
     indexJson = props.indexJson,
     actionJson = props.actionJson,
@@ -44,7 +45,7 @@ var TableRenderer = function TableRenderer(props) {
   var _useState = (0, _react.useState)(false),
     loading = _useState[0],
     setLoading = _useState[1];
-  var _useState2 = (0, _react.useState)(_dataCommon.tableConfigDefault),
+  var _useState2 = (0, _react.useState)(_dataTable.tableConfigDefault),
     config = _useState2[0],
     setConfig = _useState2[1];
   /** 维度指标初始数据 */
@@ -69,20 +70,25 @@ var TableRenderer = function TableRenderer(props) {
     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 ? {
     action: 'btn',
     name: exportConfig === null || exportConfig === void 0 ? void 0 : exportConfig.name,
+    props: {
+      disabled: !queryCacheRef.current
+    },
     fileConfig: {
       type: 'export',
       params: {
@@ -157,27 +163,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 = {};
@@ -193,7 +185,7 @@ var TableRenderer = function TableRenderer(props) {
       indexSource = _getDimTargetValues3$4 === void 0 ? [] : _getDimTargetValues3$4;
 
     /** 通过 queryBind查看是否有绑定关系 有的话替换成绑定关系中的key 没有则是默认配置的key */
-    var queryCache = queryCacheRef.current;
+    var queryCache = queryCacheRef.current || {};
     var query = {};
     var queryKeys = Object.keys(queryCache);
     if (queryKeys !== null && queryKeys !== void 0 && queryKeys.length) {
@@ -211,10 +203,10 @@ var TableRenderer = function TableRenderer(props) {
             var value = queryCache[k];
             if (key) {
               // 类型为时间时 处理
-              if ((0, _dataCommon.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
+              if ((0, _dataTable.getType)(value) === 'array' && value.length === 2 && value.some(function (d) {
                 return (0, _moment["default"])(d).isValid();
               })) {
-                var i = key.includes(_dataCommon.dateStart) ? 0 : 1;
+                var i = key.includes(_dataTable.dateStart) ? 0 : 1;
                 query[key] = value[i];
               } else {
                 query[key] = value;
@@ -240,7 +232,7 @@ var TableRenderer = function TableRenderer(props) {
         if (cur !== null && cur !== void 0 && cur.sorted) {
           orderBys.push({
             name: cur.description,
-            sort: _dataCommon.defaultSort
+            sort: _dataTable.defaultSort
           });
         }
       }
@@ -257,12 +249,12 @@ var TableRenderer = function TableRenderer(props) {
         if (_cur !== null && _cur !== void 0 && _cur.sorted) {
           orderBys.push({
             name: _cur.name,
-            sort: _dataCommon.defaultSort
+            sort: _dataTable.defaultSort
           });
         }
       }
     }
-    var queryParams = (0, _dataCommon.handleQueryParams)(query);
+    var queryParams = (0, _dataTable.handleQueryParams)(query);
     var _params = params,
       pageNum = _params.pageNum,
       pageSize = _params.pageSize,
@@ -298,57 +290,57 @@ var TableRenderer = function TableRenderer(props) {
 
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(params) {
+    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(params) {
       var data, _yield$getReportData, success, _yield$getReportData$, result;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      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;
-            return (0, _dataCommon.getReportData)(rcProContext, data);
+            _context2.next = 8;
+            return (0, _dataTable.getReportData)(rcProContext, data);
           case 8:
-            _yield$getReportData = _context3.sent;
+            _yield$getReportData = _context2.sent;
             success = _yield$getReportData.success;
             _yield$getReportData$ = _yield$getReportData.result;
             result = _yield$getReportData$ === void 0 ? {} : _yield$getReportData$;
             setLoading(false);
-            return _context3.abrupt("return", {
+            return _context2.abrupt("return", {
               success: success,
               result: result
             });
           case 16:
-            _context3.prev = 16;
-            _context3.t0 = _context3["catch"](3);
+            _context2.prev = 16;
+            _context2.t0 = _context2["catch"](3);
             setLoading(false);
-            console.error(_context3.t0);
+            console.error(_context2.t0);
           case 20:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3, null, [[3, 16]]);
+      }, _callee2, null, [[3, 16]]);
     }));
-    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 _ref4 = (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), {
@@ -356,7 +348,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 = {
@@ -367,7 +359,7 @@ var TableRenderer = function TableRenderer(props) {
               };
               handleUpdateColumns(option);
               setDimTargetValue(result);
-              setConfig((0, _extends2["default"])({}, _dataCommon.tableConfigDefault, {
+              setConfig((0, _extends2["default"])({}, _dataTable.tableConfigDefault, {
                 pagination: {
                   showSizeChanger: true,
                   defaultPageSize: defaultPageSize
@@ -395,12 +387,12 @@ var TableRenderer = function TableRenderer(props) {
             }
           case 4:
           case "end":
-            return _context4.stop();
+            return _context3.stop();
         }
-      }, _callee4);
+      }, _callee3);
     }));
-    return function initial(_x4) {
-      return _ref5.apply(this, arguments);
+    return function initial(_x3) {
+      return _ref4.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -414,42 +406,51 @@ var TableRenderer = function TableRenderer(props) {
       timer = null;
     }
   };
-  (0, _react.useEffect)(function () {
-    var _ref6 = (activeKey === null || activeKey === void 0 ? void 0 : activeKey.split(_dataCommon.separator)) || [],
-      currentKey = _ref6[0];
-    if (currentKey === dataSetName) {
-      if (autoLoad) {
-        if (refreshRate) {
-          handleClearInterval();
-          timer = window.setInterval(function () {
-            return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-          }, refreshRate * _dataCommon.timeUnit);
-        } else {
-          onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
-        }
+  var onload = function onload() {
+    if (autoLoad) {
+      if (refreshRate) {
+        handleClearInterval();
+        timer = window.setInterval(function () {
+          return onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
+        }, refreshRate * _dataTable.timeUnit);
+      } else {
+        onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
       }
     } else {
       handleClearInterval();
     }
+  };
+  (0, _react.useEffect)(function () {
+    if (currentKey) {
+      var _ref5 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref5[0];
+      if (curDataSetName === dataSetName) {
+        onload();
+      } else {
+        handleClearInterval();
+      }
+    } else {
+      onload();
+    }
     return function () {
       handleClearInterval();
     };
-  }, [activeKey, autoLoad]);
+  }, [currentKey, autoLoad]);
   var queryChart = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(value) {
+    var _ref6 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(value) {
       var _linkChartRef$current3;
-      return _regenerator["default"].wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regenerator["default"].wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             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() {
+              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) {
+                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator4, _step4, cur, _ref8, success, _ref8$result, result, _result$data, _result$data$, data;
+                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
@@ -459,7 +460,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 = [];
@@ -469,42 +470,42 @@ 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;
-                      success = _ref9.success;
-                      _ref9$result = _ref9.result;
-                      result = _ref9$result === void 0 ? {} : _ref9$result;
+                      _ref8 = _context4.t0;
+                      success = _ref8.success;
+                      _ref8$result = _ref8.result;
+                      result = _ref8$result === void 0 ? {} : _ref8$result;
                       if (success) {
                         _result$data = result === null || result === void 0 ? void 0 : result.data, _result$data$ = _result$data[0], data = _result$data$ === void 0 ? {} : _result$data$;
                         amounted.current = data;
                       }
                     case 16:
                     case "end":
-                      return _context5.stop();
+                      return _context4.stop();
                   }
-                }, _callee5);
+                }, _callee4);
               })), 200);
             }
           case 1:
           case "end":
-            return _context6.stop();
+            return _context5.stop();
         }
-      }, _callee6);
+      }, _callee5);
     }));
-    return function queryChart(_x5) {
-      return _ref7.apply(this, arguments);
+    return function queryChart(_x4) {
+      return _ref6.apply(this, arguments);
     };
   }();
   (0, _react.useImperativeHandle)(chartRef, function () {

package/lib/components/{z-templates-data-common → z-data-table}/components/table-renderer/table-renderer.helper.d.ts

@@ -1,46 +1,46 @@
-import { TypeChartSettingProps } from '../../data-common';
+import type { TypeZDataTableProps } from '../../data-table';
+import type { valueType } from '../../data-table.helper';
 import type { linkParamsType } from '../link-renderer';
 import type { DimTargetChangeOptionType } from '../dim-target/dim-target.helper';
-import type { valueType } from '../../data-common.helper';
 export declare const stringTrim: (str: string) => string;
 /**
  * 维度指标数据源处理
  */
-export declare const handleDimTargetFormat: (dimTargetSource: Pick<TypeChartSettingProps, 'dimJson' | 'indexJson'>, result?: Record<string, any>) => {
+export declare const handleDimTargetFormat: (dimTargetSource: Pick<TypeZDataTableProps, 'dimJson' | 'indexJson'>, result?: Record<string, any>) => {
     rememberCheck: boolean;
     dims: {
         all: boolean;
         title: string;
         indeterminate: boolean;
         dimension: any[];
-        dimensionSource: Omit<import("../../data-common").TypeTargetProps, "amounted" | "enName" | "isFilter">[];
+        dimensionSource: Omit<import("../../data-table").TypeTargetProps, "amounted" | "enName" | "isFilter">[];
     };
     targets: {
         all: boolean;
         title: string;
         indeterminate: boolean;
         index: any[];
-        indexSource: import("../../data-common").TypeTargetProps[];
+        indexSource: import("../../data-table").TypeTargetProps[];
     };
 };
 /**
  * 获取维度指标数据源
  */
-export declare const getDimTargetData: (rcProContext: any, params: Record<string, any>, dimTargetSource: Pick<TypeChartSettingProps, 'dimJson' | 'indexJson'>) => Promise<{
+export declare const getDimTargetData: (rcProContext: any, params: Record<string, any>, dimTargetSource: Pick<TypeZDataTableProps, 'dimJson' | 'indexJson'>) => Promise<{
     rememberCheck: boolean;
     dims: {
         all: boolean;
         title: string;
         indeterminate: boolean;
         dimension: any[];
-        dimensionSource: Omit<import("../../data-common").TypeTargetProps, "amounted" | "enName" | "isFilter">[];
+        dimensionSource: Omit<import("../../data-table").TypeTargetProps, "amounted" | "enName" | "isFilter">[];
     };
     targets: {
         all: boolean;
         title: string;
         indeterminate: boolean;
         index: any[];
-        indexSource: import("../../data-common").TypeTargetProps[];
+        indexSource: import("../../data-table").TypeTargetProps[];
     };
 }>;
 /**
@@ -54,7 +54,7 @@ export type ExpressionsType = any[] | [];
 /**
  * 根据维度指标获取表格列
  */
-export declare const handleColumns: (option: DimTargetChangeOptionType & Pick<TypeChartSettingProps, 'actionJson'>, expressions?: ExpressionsType, linkPage?: TypeChartSettingProps[], onLink?: (v: linkParamsType) => void) => {
+export declare const handleColumns: (option: DimTargetChangeOptionType & Pick<TypeZDataTableProps, 'actionJson'>, expressions?: ExpressionsType, linkPage?: TypeZDataTableProps[], onLink?: (v: linkParamsType) => void) => {
     title: import("antd/es/checkbox/Group").CheckboxValueType;
     dataIndex: string;
     ellipsis: boolean;