@ztocwst/rc-pro-materials 0.2.23 → 0.2.25

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

@@ -0,0 +1,120 @@
+import React from 'react';
+import type { linkParamsType } from './components/link-renderer';
+/** 指标配置 */
+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 TypeZDataTableProps {
+    /** 标题 */
+    title?: string;
+    /** 二级页标题 */
+    chartTitle?: string;
+    /** 自定义渲染 */
+    custom?: boolean;
+    /** 自定义渲染方法 */
+    child?: (p: any) => React.ReactNode;
+    /** 维度配置 */
+    dimJson?: {
+        /** 维度标题 */
+        title: string;
+        /** 维度项配置 */
+        data: Array<Omit<TypeTargetProps, 'amounted' | 'enName' | 'isFilter'>>;
+    };
+    /** 指标配置 */
+    indexJson: {
+        title: string;
+        /** 指标项配置 */
+        data: TypeTargetProps[];
+    };
+    dataSetName: string;
+    /** 自动请求 */
+    autoLoad: boolean;
+    /** 刷新时间 */
+    refreshRate?: number;
+    /** 记住勾选 */
+    remember?: boolean;
+    /** 操作列(表头)配置 */
+    actionJson?: {
+        /** 表头名称 */
+        title: string;
+        /** 宽度 */
+        width?: number;
+        /** 固定列 */
+        isFixed: boolean;
+        /** 固定到 */
+        fixed?: string;
+        /** 自定义渲染 */
+        custom: boolean;
+        /** 自定义渲染方法 */
+        render?: (p: any) => React.ReactNode;
+    };
+    confirmConfig?: {
+        name?: string;
+        onClick?: () => void;
+    };
+    /** 导出 */
+    exporter?: boolean;
+    /** 导出配置 */
+    exportConfig?: {
+        name: string;
+        code: string;
+        menuId: string;
+    };
+    /** 条件格式设置 */
+    expressions?: any[] | [];
+    linkPageTitle?: string;
+    /** 下钻二级页设置 */
+    linkPage?: TypeZDataTableProps[];
+    /** 数据源参数"键"" 和 查询参数"值" 和 上一级维度(dim)"值" 关系绑定 */
+    queryBind?: Array<{
+        sourceQueryKey: string;
+        currentQueryKey: string;
+        parentDimKey: string;
+    }>;
+    /** chartRef */
+    chartRef?: React.Ref<{
+        onLink?: (v: linkParamsType) => void;
+        queryChart: (v: Record<string, any>, d: string | undefined) => void;
+    }>;
+    /** 确认 */
+    onConfirm?: () => void;
+    /** 查询参数转换 */
+    formatter?: (v: Record<string, any>) => Record<string, any>;
+    /** 当前展示报表唯一标识 */
+    currentKey?: string;
+}
+export default class ZDataTableContainer extends React.Component<TypeZDataTableProps, any> {
+    chartRef: any;
+    constructor(props: TypeZDataTableProps);
+    render(): JSX.Element;
+}

package/es/components/{z-templates-data-common/data-common.helper.js → z-data-table/data-table.helper.js}

@@ -175,7 +175,7 @@ export var handleCondition = function handleCondition(value, handledValue, condi
 };
 
 // mock
-var token = 'scm:tenant:token:2:104:4EE94781916163519F3A5744296BAD40';
+var token = 'scm:tenant:token:2:104:7c454641-c65c-4459-b5a3-d4be9fb16ffd';
 
 /** 获取维度指标 */
 export var getDimTarget = /*#__PURE__*/function () {

package/es/components/z-data-table/data-table.js

@@ -0,0 +1,52 @@
+import _inheritsLoose from "@babel/runtime/helpers/inheritsLoose";
+import _extends from "@babel/runtime/helpers/extends";
+import React, { useRef, useImperativeHandle } from 'react';
+import TableRenderer from "./components/table-renderer";
+import CustomRenderer from "./components/custom-renderer";
+
+/** 指标配置 */
+
+/** 表格相关配置 */
+
+var ZDataTable = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  // console.log(props)
+
+  var chartRef = useRef();
+  var onLink = function onLink(values) {
+    var _chartRef$current, _chartRef$current$onL;
+    return (_chartRef$current = chartRef.current) === null || _chartRef$current === void 0 ? void 0 : (_chartRef$current$onL = _chartRef$current.onLink) === null || _chartRef$current$onL === void 0 ? void 0 : _chartRef$current$onL.call(_chartRef$current, values);
+  };
+  var queryChart = function queryChart(values) {
+    var _chartRef$current2, _chartRef$current2$qu;
+    return (_chartRef$current2 = chartRef.current) === null || _chartRef$current2 === void 0 ? void 0 : (_chartRef$current2$qu = _chartRef$current2.queryChart) === null || _chartRef$current2$qu === void 0 ? void 0 : _chartRef$current2$qu.call(_chartRef$current2, values);
+  };
+  useImperativeHandle(ref, function () {
+    return {
+      onLink: onLink,
+      queryChart: queryChart
+    };
+  });
+  return props !== null && props !== void 0 && props.custom ? /*#__PURE__*/React.createElement(CustomRenderer, _extends({
+    chartRef: chartRef
+  }, props)) : /*#__PURE__*/React.createElement(TableRenderer, _extends({
+    chartRef: chartRef
+  }, props));
+});
+var ZDataTableContainer = /*#__PURE__*/function (_React$Component) {
+  _inheritsLoose(ZDataTableContainer, _React$Component);
+  function ZDataTableContainer(props) {
+    var _this;
+    _this = _React$Component.call(this, props) || this;
+    _this.chartRef = void 0;
+    _this.chartRef = /*#__PURE__*/React.createRef();
+    return _this;
+  }
+  var _proto = ZDataTableContainer.prototype;
+  _proto.render = function render() {
+    return /*#__PURE__*/React.createElement(ZDataTable, _extends({}, this.props, {
+      ref: this.chartRef
+    }));
+  };
+  return ZDataTableContainer;
+}(React.Component);
+export { ZDataTableContainer as default };

package/es/components/z-data-table/index.d.ts

@@ -0,0 +1,7 @@
+import ZDataTable from './data-table';
+export type { TypeZDataTableProps } from './data-table';
+export type { linkParamsType } from './components/link-renderer';
+export { default as TableRenderer } from './components/table-renderer';
+export { default as CustomRenderer } from './components/custom-renderer';
+export { default as LinkRenderer } from './components/link-renderer';
+export default ZDataTable;

package/es/components/z-data-table/index.js

@@ -0,0 +1,5 @@
+import ZDataTable from "./data-table";
+export { default as TableRenderer } from "./components/table-renderer";
+export { default as CustomRenderer } from "./components/custom-renderer";
+export { default as LinkRenderer } from "./components/link-renderer";
+export default ZDataTable;

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { TypeZTemplatesDataCommonProps } from '../../data-common';
-import type { linkParamsType } from '../link-renderer';
+import type { linkParamsType } from '../../../z-data-table';
 export interface ChartRendererProps {
     chartSetting?: Pick<TypeZTemplatesDataCommonProps, 'chartSetting'>;
     chartRenderRef?: React.Ref<{

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

@@ -1,9 +1,8 @@
 import _Tabs from "antd/es/tabs";
 import _extends from "@babel/runtime/helpers/extends";
 import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
-import { separator } from "../../data-common.helper";
-import TableRenderer from "../table-renderer";
-import CustomRenderer from "../custom-renderer";
+import { separator } from "../../../z-data-table/data-table.helper";
+import { TableRenderer, CustomRenderer } from "../../../z-data-table";
 var ChartRenderer = function ChartRenderer(_ref) {
   var chartRenderRef = _ref.chartRenderRef,
     chartSetting = _ref.chartSetting,
@@ -30,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);
@@ -50,7 +52,8 @@ var ChartRenderer = function ChartRenderer(_ref) {
   useImperativeHandle(chartRenderRef, function () {
     return {
       onLink: onLink,
-      queryChart: queryChart
+      queryChart: queryChart,
+      getCurrentKey: getCurrentKey
     };
   });
 
@@ -68,8 +71,14 @@ var ChartRenderer = function ChartRenderer(_ref) {
 
   // 普通列表json对象
   if (isObject) {
-    return /*#__PURE__*/React.createElement(TableRenderer, _extends({}, chartSetting, {
-      activeKey: activeKey,
+    return chartSetting !== null && chartSetting !== void 0 && chartSetting.custom ? /*#__PURE__*/React.createElement(CustomRenderer, _extends({}, chartSetting, {
+      currentKey: activeKey,
+      chartRef: function chartRef(ref) {
+        _chartRef.current[chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName] = ref;
+      },
+      onConfirm: onConfirm
+    })) : /*#__PURE__*/React.createElement(TableRenderer, _extends({}, chartSetting, {
+      currentKey: activeKey,
       chartRef: function chartRef(ref) {
         _chartRef.current[chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName] = ref;
       },
@@ -84,18 +93,18 @@ var ChartRenderer = function ChartRenderer(_ref) {
     return /*#__PURE__*/React.createElement(_Tabs, {
       activeKey: activeKey,
       onChange: handleTabsChange
-    }, chartSetting.map(function (e, i) {
+    }, chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.map(function (e, i) {
       return /*#__PURE__*/React.createElement(_Tabs.TabPane, {
         tab: "" + ((e === null || e === void 0 ? void 0 : e.title) || ''),
         key: "" + (e === null || e === void 0 ? void 0 : e.dataSetName) + separator + i.toString()
       }, e !== null && e !== void 0 && e.custom ? /*#__PURE__*/React.createElement(CustomRenderer, _extends({}, e, {
-        activeKey: activeKey,
+        currentKey: activeKey,
         chartRef: function chartRef(ref) {
           _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + separator + i] = ref;
         },
         onConfirm: onConfirm
       })) : /*#__PURE__*/React.createElement(TableRenderer, _extends({}, e, {
-        activeKey: activeKey,
+        currentKey: activeKey,
         chartRef: function chartRef(ref) {
           _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + separator + i] = ref;
         },

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...
@@ -63,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;
@@ -92,22 +91,22 @@ 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,
-    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

@@ -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';
@@ -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';
 /**
  * 维度状态
  */