@ztocwst/rc-pro-materials 0.2.23 → 0.2.24

package/es/components/z-templates-data-common/data-common.d.ts

@@ -1,120 +1,11 @@
 import React from 'react';
 import type { ProFormRenderProps } from '@ztocwst/rc-pro';
-/** 指标配置 */
-export interface TypeTargetProps {
-    /** 指标名称 */
-    name: string;
-    /** 是否默认选中 */
-    checked: boolean;
-    /** 别名 */
-    alias: string;
-    /** 英文名 */
-    enName: string;
-    /** 是否过滤 */
-    isFilter: boolean;
-    /** 是否可选 */
-    optional: boolean;
-    /** 小数位 精确度 */
-    precision: number;
-    /** 是否展示百分号 */
-    percent: boolean;
-    /** 是否允许排序 */
-    sorted: boolean;
-    /** 宽度 */
-    width: number;
-    /** 是否合计 */
-    amounted: boolean;
-    /** 指标描述 */
-    description?: string;
-    /** 下转二级页 */
-    link?: string;
-    /** 查询绑定关系 */
-    queryBind?: string;
-    /** 依赖 */
-    dependencies?: string[];
-}
-/** 表格相关配置 */
-export interface TypeChartSettingProps {
-    /** 二级页标题 */
-    chartTitle?: string;
-    /** 自定义渲染 */
-    custom?: boolean;
-    /** 自定义渲染方法 */
-    child?: (p: any) => React.ReactNode;
-    /** 标题 */
-    title?: string;
-    /** 维度配置 */
-    dimJson?: {
-        /** 维度标题 */
-        title: string;
-        /** 维度项配置 */
-        data: Array<Omit<TypeTargetProps, 'amounted' | 'enName' | 'isFilter'>>;
-    };
-    /** 指标配置 */
-    indexJson: {
-        title: string;
-        /** 指标项配置 */
-        data: TypeTargetProps[];
-    };
-    dataSetName: string;
-    /** 自动请求 */
-    autoLoad: boolean;
-    /** 刷新时间 */
-    refreshRate?: number;
-    /** 记住勾选 */
-    remember?: boolean;
-    /** 导出 */
-    exporter?: boolean;
-    /** 操作列(表头)配置 */
-    actionJson?: {
-        /** 表头名称 */
-        title: string;
-        /** 宽度 */
-        width?: number;
-        /** 固定列 */
-        isFixed: boolean;
-        /** 固定到 */
-        fixed?: string;
-        /** 自定义渲染 */
-        custom: boolean;
-        /** 自定义渲染方法 */
-        render?: (p: any) => React.ReactNode;
-    };
-    /** 导出配置 */
-    exportConfig?: {
-        name: string;
-        code: string;
-        menuId: string;
-    };
-    /** 条件格式设置 */
-    expressions?: any[] | [];
-    linkPageTitle?: string;
-    /** 下钻二级页设置 */
-    linkPage?: TypeChartSettingProps[];
-    /** 数据源参数"键"" 和 查询参数"值" 和 上一级维度(dim)"值" 关系绑定 */
-    queryBind?: Array<{
-        sourceQueryKey: string;
-        currentQueryKey: string;
-        parentDimKey: string;
-    }>;
-    /** chartRef */
-    chartRef?: React.Ref<{
-        queryChart: (v: Record<string, any>, d: string | undefined) => void;
-    }>;
-    /** 确认 */
-    onConfirm?: () => void;
-    /** 查询参数转换 */
-    formatter?: (v: Record<string, any>) => Record<string, any>;
-}
+import type { TypeZDataTableProps } from '../z-data-table';
 export interface TypeZTemplatesDataCommonProps {
     /** 查询表单配置 */
     querySetting: ProFormRenderProps;
     /** 内容区配置 */
-    chartSetting: TypeChartSettingProps | Array<TypeChartSettingProps & {
-        custom: boolean;
-        child: (p: any) => React.ReactNode;
-        title: string;
-    }> | React.ReactNode;
+    chartSetting: TypeZDataTableProps | TypeZDataTableProps[] | React.ReactNode;
     _unsafe_MixedSetter_chartSetting_select?: any;
 }
 export default class ZTemplatesDataCommonContainer extends React.Component<TypeZTemplatesDataCommonProps, any> {

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

@@ -7,15 +7,10 @@ import React, { useRef, useImperativeHandle } from 'react';
 import { ProFormRender } from '@ztocwst/rc-pro';
 import ChartRenderer from "./components/chart-renderer";
 import { processFormProps } from "../../utils";
-
-/** 指标配置 */
-
-/** 表格相关配置 */
-
 var ZTemplatesDataCommon = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var querySetting = props.querySetting,
+    chartSetting = props.chartSetting,
     _unsafe_MixedSetter_chartSetting_select = props._unsafe_MixedSetter_chartSetting_select;
-  var chartSetting = props.chartSetting;
   var formRef = useRef();
   var chartRenderRef = useRef();
   // todo 不知道meta里是哪里配置有问题，出现_unsafe_MixedSetter...
@@ -107,7 +102,6 @@ var ZTemplatesDataCommon = /*#__PURE__*/React.forwardRef(function (props, ref) {
   console.log("formProps", formProps);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(ProFormRender, _extends({}, formProps, {
     formRef: formRef,
-    onValuesChange: function onValuesChange(changeValues) {},
     onFinish: /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(formatData) {
         var _formProps$onFinish;

package/es/index.d.ts

@@ -34,6 +34,8 @@ export { default as ZPointerBlock } from './components/z-pointer-block';
 export type { TypeZPointerBlockProps } from './components/z-pointer-block';
 export { default as ZAggBlock } from './components/z-agg-block';
 export type { TypeAggBlockProps } from './components/z-agg-block';
+export { default as ZDataTable } from './components/z-data-table';
+export type { TypeZDataTableProps } from './components/z-data-table';
 export { default as ZTemplatesDataCommon } from './components/z-templates-data-common';
 export type { TypeZTemplatesDataCommonProps } from './components/z-templates-data-common';
 export { default as ZSlick } from './components/z-slick';

package/es/index.js

@@ -22,6 +22,8 @@ export { default as ZOperationRecords } from "./components/z-operation-records";
 export { default as ZPointerBlock } from "./components/z-pointer-block";
 // 聚合指标
 export { default as ZAggBlock } from "./components/z-agg-block";
+// 数据表格
+export { default as ZDataTable } from "./components/z-data-table";
 export { default as ZTemplatesDataCommon } from "./components/z-templates-data-common";
 export { default as ZSlick } from "./components/z-slick";
 

package/es/style.js

@@ -18,10 +18,10 @@ import 'antd/es/table/style';
 import 'antd/es/typography/style';
 import 'antd/es/row/style';
 import 'antd/es/col/style';
-import 'antd/es/message/style';
-import 'antd/es/tabs/style';
 import 'antd/es/checkbox/style';
 import 'antd/es/spin/style';
 import 'antd/es/radio/style';
+import 'antd/es/message/style';
+import 'antd/es/tabs/style';
 import 'antd/es/carousel/style';
 import './index.scss';

package/es/utils/props/form.js

@@ -3,7 +3,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutP
 var _excluded = ["fieldProps", "formItemProps", "dependencyColumns", "required", "initialValue"],
   _excluded2 = ["restFieldProps", "renderItemSlot"],
   _excluded3 = ["restFormProps"],
-  _excluded4 = ["fieldProps"],
+  _excluded4 = ["fieldProps", "hideInDependency"],
   _excluded5 = ["requestOptions"],
   _excluded6 = ["columns", "switchGroup"];
 /**
@@ -62,10 +62,13 @@ var processInitialValue = function processInitialValue(e) {
         }
         var childRest = processInitialValue(child);
         var childFieldProps = childRest.fieldProps,
+          hideInDependency = childRest.hideInDependency,
           childItemRest = _objectWithoutPropertiesLoose(childRest, _excluded4);
         var requestOptions = childFieldProps.requestOptions,
           childRestFieldProps = _objectWithoutPropertiesLoose(childFieldProps, _excluded5);
-        return _extends({}, childItemRest, {
+        return _extends({}, hideInDependency ? {
+          hideInForm: !hideInDependency(obj)
+        } : {}, childItemRest, {
           fieldProps: _extends({}, childRestFieldProps, (childRest === null || childRest === void 0 ? void 0 : childRest.valueType) === 'asyncSelect' &&
           // 接口请求前置校验, 通过请求 asyncSelect 接口
           requestOptionsCheck(childRestFieldProps === null || childRestFieldProps === void 0 ? void 0 : childRestFieldProps.requestOptionsCheck, obj) ? {

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

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

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

@@ -9,7 +9,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("react");
 var _rcPro = require("@ztocwst/rc-pro");
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _linkRenderer = _interopRequireDefault(require("../link-renderer"));
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate 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,7 +17,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 var CustomRenderer = function CustomRenderer(props) {
   var _props$child;
   var _ref = props || {},
-    activeKey = _ref.activeKey,
+    currentKey = _ref.currentKey,
     autoLoad = _ref.autoLoad,
     refreshRate = _ref.refreshRate,
     dataSetName = _ref.dataSetName,
@@ -25,6 +25,7 @@ var CustomRenderer = function CustomRenderer(props) {
     indexJson = _ref.indexJson,
     linkPage = _ref.linkPage,
     linkPageTitle = _ref.linkPageTitle,
+    chartRef = _ref.chartRef,
     onConfirm = _ref.onConfirm,
     formatter = _ref.formatter;
   var rcProContext = (0, _react.useContext)(_rcPro.RcConfigContext);
@@ -65,7 +66,7 @@ var CustomRenderer = function CustomRenderer(props) {
                 });
               }
             }
-            queryParams = (0, _dataCommon.handleQueryParams)(query);
+            queryParams = (0, _dataTable.handleQueryParams)(query);
             data = {
               target: target,
               queryParams: queryParams,
@@ -73,7 +74,7 @@ var CustomRenderer = function CustomRenderer(props) {
             };
             setLoading(true);
             _context.next = 9;
-            return (0, _dataCommon.getReportData)(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
+            return (0, _dataTable.getReportData)(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
           case 9:
             res = _context.sent;
             setLoading(false);
@@ -126,28 +127,37 @@ var CustomRenderer = function CustomRenderer(props) {
       timer = null;
     }
   };
-  (0, _react.useEffect)(function () {
-    var _ref4 = (activeKey === null || activeKey === void 0 ? void 0 : activeKey.split(_dataCommon.separator)) || [],
-      currentKey = _ref4[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 _ref4 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref4[0];
+      if (curDataSetName === dataSetName) {
+        onload();
+      } else {
+        handleClearInterval();
+      }
+    } else {
+      onload();
+    }
     return function () {
       handleClearInterval();
     };
-  }, [activeKey, autoLoad]);
-  (0, _react.useImperativeHandle)(props.chartRef, function () {
+  }, [currentKey, autoLoad]);
+  (0, _react.useImperativeHandle)(chartRef, function () {
     return {
       onLink: onLink,
       queryChart: queryChart
@@ -159,7 +169,7 @@ var CustomRenderer = function CustomRenderer(props) {
     }
   }, /*#__PURE__*/React.createElement(_spin["default"], {
     spinning: loading
-  }, (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result))), /*#__PURE__*/React.createElement("div", {
+  }, props === null || props === void 0 ? void 0 : (_props$child = props.child) === null || _props$child === void 0 ? void 0 : _props$child.call(props, result))), /*#__PURE__*/React.createElement("div", {
     style: {
       display: isLink ? 'block' : 'none'
     }

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

@@ -1,5 +1,5 @@
 import type { CheckboxValueType } from 'antd/es/checkbox/Group';
-import { TypeTargetProps } from '../../data-common';
+import { TypeTargetProps } from '../../data-table';
 /**
  * 维度状态
  */

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,7 +21,7 @@ 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,
@@ -44,7 +44,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];
   /** 维度指标初始数据 */
@@ -83,6 +83,9 @@ var TableRenderer = function TableRenderer(props) {
   }, exporter ? {
     action: 'btn',
     name: exportConfig === null || exportConfig === void 0 ? void 0 : exportConfig.name,
+    props: {
+      disabled: !queryCacheRef.current
+    },
     fileConfig: {
       type: 'export',
       params: {
@@ -193,7 +196,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 +214,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 +243,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 +260,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,
@@ -316,7 +319,7 @@ var TableRenderer = function TableRenderer(props) {
             data = getBigDataBody(params);
             setLoading(true);
             _context3.next = 8;
-            return (0, _dataCommon.getReportData)(rcProContext, data);
+            return (0, _dataTable.getReportData)(rcProContext, data);
           case 8:
             _yield$getReportData = _context3.sent;
             success = _yield$getReportData.success;
@@ -367,7 +370,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
@@ -414,27 +417,36 @@ 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 _ref6 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref6[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 _linkChartRef$current3;