@ztocwst/rc-pro-materials 0.2.22 → 0.2.24

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,10 +54,11 @@ 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;
+    defaultSortOrder: string;
     sorter: any;
     width: any;
     fixed: any;

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

@@ -7,7 +7,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _dataCommon = require("../../data-common.helper");
+var _dataTable = require("../../data-table.helper");
 var _excluded = ["isFixed", "fixed", "render"];
 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); }
@@ -119,7 +119,7 @@ var getDimTargetData = /*#__PURE__*/function () {
         case 2:
           _context.prev = 2;
           _context.next = 5;
-          return (0, _dataCommon.getDimTarget)(rcProContext, params);
+          return (0, _dataTable.getDimTarget)(rcProContext, params);
         case 5:
           _yield$getDimTarget = _context.sent;
           success = _yield$getDimTarget.success;
@@ -157,20 +157,20 @@ var handleValueFormat = function handleValueFormat(value, record, config, condit
   var val = value;
   if (typeof value === 'number') {
     if (!(config !== null && config !== void 0 && config.percent) && typeof (config === null || config === void 0 ? void 0 : config.precision) === 'number') {
-      val = (0, _dataCommon.handleDecimal)(val, config.precision);
+      val = (0, _dataTable.handleDecimal)(val, config.precision);
     }
     if (config !== null && config !== void 0 && config.thousand) {
-      val = (0, _dataCommon.handleThousand)(val);
+      val = (0, _dataTable.handleThousand)(val);
     }
     if (config !== null && config !== void 0 && config.percent) {
-      val = (0, _dataCommon.handlePercent)(val, config.precision);
+      val = (0, _dataTable.handlePercent)(val, config.precision);
     }
   }
   if (config !== null && config !== void 0 && config.link) {
-    val = (0, _dataCommon.handleLink)(value, onLink);
+    val = (0, _dataTable.handleLink)(value, onLink);
   }
   if (condition !== null && condition !== void 0 && condition.length) {
-    val = (0, _dataCommon.handleCondition)(value, val, condition);
+    val = (0, _dataTable.handleCondition)(value, val, condition);
   }
   return (_val = val) !== null && _val !== void 0 ? _val : "-";
 };
@@ -184,51 +184,62 @@ exports.handleValueFormat = handleValueFormat;
  */
 var handleColumns = function handleColumns(option, expressions, linkPage, onLink) {
   var _option$actionJson;
+  var isFirst = true;
   var dimTarget = [].concat(option.dimension, option.index);
   var columns = dimTarget.map(function (title) {
-    var _config3, _config3$link, _config4, _config5, _config6, _title$toString, _config7, _config8, _config9;
+    var _config5, _config5$link, _config6, _config7, _config8, _title$toString, _config9, _config10, _config11;
     var config;
     var dataIndex;
+    var defaultSortOrder;
     var condition;
     if (!config) {
-      var _option$dimensionSour, _config;
+      var _option$dimensionSour, _config, _config2;
       /* 通过别名或名称 查找当前维度的配置 */
       config = (_option$dimensionSour = option.dimensionSource) === null || _option$dimensionSour === void 0 ? void 0 : _option$dimensionSour.find(function (item) {
         return item.alias === title || item.description === title;
       });
       dataIndex = (_config = config) === null || _config === void 0 ? void 0 : _config.description;
+      if ((_config2 = config) !== null && _config2 !== void 0 && _config2.sorted && isFirst) {
+        isFirst = false;
+        defaultSortOrder = _dataTable.defaultSort + "end";
+      }
     }
     if (!config) {
-      var _option$indexSource, _config2;
+      var _option$indexSource, _config3, _config4;
       /* 通过别名或名称 查找当前指标的配置 */
       config = (_option$indexSource = option.indexSource) === null || _option$indexSource === void 0 ? void 0 : _option$indexSource.find(function (item) {
         return item.alias === title || item.name === title;
       });
-      dataIndex = (_config2 = config) === null || _config2 === void 0 ? void 0 : _config2.name;
+      dataIndex = (_config3 = config) === null || _config3 === void 0 ? void 0 : _config3.name;
+      if ((_config4 = config) !== null && _config4 !== void 0 && _config4.sorted && isFirst) {
+        isFirst = false;
+        defaultSortOrder = _dataTable.defaultSort + "end";
+      }
     }
     /* 条件格式设置 */
     // if (expressions?.length) {
     //   condition = expressions?.filter((item) => item?.index?.includes(config?.name));
     // }
 
-    var _ref4 = ((_config3 = config) === null || _config3 === void 0 ? void 0 : (_config3$link = _config3.link) === null || _config3$link === void 0 ? void 0 : _config3$link.split(_dataCommon.separator)) || [],
+    var _ref4 = ((_config5 = config) === null || _config5 === void 0 ? void 0 : (_config5$link = _config5.link) === null || _config5$link === void 0 ? void 0 : _config5$link.split(_dataTable.separator)) || [],
       dataSetName = _ref4[0];
     var index;
-    if ((_config4 = config) !== null && _config4 !== void 0 && _config4.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
+    if ((_config6 = config) !== null && _config6 !== void 0 && _config6.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
       index = linkPage.findIndex(function (link) {
-        return "" + link.dataSetName + _dataCommon.separator + link.title === config.link;
+        return "" + link.dataSetName + _dataTable.separator + link.title === config.link;
       });
     }
     return {
       title: title,
       dataIndex: dataIndex,
       ellipsis: true,
-      sorter: (_config5 = config) === null || _config5 === void 0 ? void 0 : _config5.sorted,
-      width: ((_config6 = config) === null || _config6 === void 0 ? void 0 : _config6.width) || (0, _dataCommon.computeWidth)(title === null || title === void 0 ? void 0 : (_title$toString = title.toString()) === null || _title$toString === void 0 ? void 0 : _title$toString.length),
-      fixed: (_config7 = config) !== null && _config7 !== void 0 && _config7.isFixed ? ((_config8 = config) === null || _config8 === void 0 ? void 0 : _config8.fixed) || ((_config9 = config) === null || _config9 === void 0 ? void 0 : _config9.isFixed) : false,
+      defaultSortOrder: defaultSortOrder,
+      sorter: (_config7 = config) === null || _config7 === void 0 ? void 0 : _config7.sorted,
+      width: ((_config8 = config) === null || _config8 === void 0 ? void 0 : _config8.width) || (0, _dataTable.computeWidth)(title === null || title === void 0 ? void 0 : (_title$toString = title.toString()) === null || _title$toString === void 0 ? void 0 : _title$toString.length),
+      fixed: (_config9 = config) !== null && _config9 !== void 0 && _config9.isFixed ? ((_config10 = config) === null || _config10 === void 0 ? void 0 : _config10.fixed) || ((_config11 = config) === null || _config11 === void 0 ? void 0 : _config11.isFixed) : false,
       render: function render(value, record) {
-        var _config$render, _config10;
-        return config.custom ? (_config$render = (_config10 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config10, value, record, config, condition) : handleValueFormat(value, record, config, condition, function () {
+        var _config$render, _config12;
+        return config.custom ? (_config$render = (_config12 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config12, value, record, config, condition) : handleValueFormat(value, record, config, condition, function () {
           return onLink({
             dataSetName: dataSetName,
             index: index,

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

@@ -0,0 +1,116 @@
+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;
+    /** 导出 */
+    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?: 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/lib/components/{z-templates-data-common/data-common.helper.d.ts → z-data-table/data-table.helper.d.ts}

@@ -14,6 +14,8 @@ export declare const separator = "***";
 export declare const timeUnit: number;
 /** 介于 前闭后开 */
 export declare const BETWEEN = "<=,<";
+/** 默认排序 */
+export declare const defaultSort = "asc";
 /** 数据类型 */
 export type valueType = number | string | null | undefined;
 /**

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

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
-exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.dateStart = exports.computeWidth = exports.BETWEEN = void 0;
+exports.timeUnit = exports.tableConfigDefault = exports.separator = exports.saveDimTarget = exports.handleThousand = exports.handleQueryParams = exports.handlePercent = exports.handleLink = exports.handleDecimal = exports.handleCondition = exports.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.defaultSort = exports.dateStart = exports.computeWidth = exports.BETWEEN = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
@@ -34,8 +34,12 @@ var timeUnit = 60 * 1000;
 exports.timeUnit = timeUnit;
 var BETWEEN = '<=,<';
 
-/** 数据类型 */
+/** 默认排序 */
 exports.BETWEEN = BETWEEN;
+var defaultSort = 'asc';
+
+/** 数据类型 */
+exports.defaultSort = defaultSort;
 /**
  * 获取数据类型
  * @param {any} value
@@ -189,7 +193,7 @@ var handleCondition = function handleCondition(value, handledValue, conditions)
 
 // mock
 exports.handleCondition = handleCondition;
-var token = 'scm:tenant:token:2:104:DB0D80CD71B76AF4A8858729478BA945';
+var token = 'scm:tenant:token:2:104:CCAB6974939D70D8418CBEC342EAE22D';
 
 /** 获取维度指标 */
 var getDimTarget = /*#__PURE__*/function () {

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

@@ -0,0 +1,58 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports["default"] = void 0;
+var _inheritsLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/inheritsLoose"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _react = _interopRequireWildcard(require("react"));
+var _tableRenderer = _interopRequireDefault(require("./components/table-renderer"));
+var _customRenderer = _interopRequireDefault(require("./components/custom-renderer"));
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/** 指标配置 */
+
+/** 表格相关配置 */
+
+var ZDataTable = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
+  // console.log(props)
+
+  var chartRef = (0, _react.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);
+  };
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      onLink: onLink,
+      queryChart: queryChart
+    };
+  });
+  return props !== null && props !== void 0 && props.custom ? /*#__PURE__*/_react["default"].createElement(_customRenderer["default"], (0, _extends2["default"])({
+    chartRef: chartRef
+  }, props)) : /*#__PURE__*/_react["default"].createElement(_tableRenderer["default"], (0, _extends2["default"])({
+    chartRef: chartRef
+  }, props));
+});
+var ZDataTableContainer = /*#__PURE__*/function (_React$Component) {
+  (0, _inheritsLoose2["default"])(ZDataTableContainer, _React$Component);
+  function ZDataTableContainer(props) {
+    var _this;
+    _this = _React$Component.call(this, props) || this;
+    _this.chartRef = void 0;
+    _this.chartRef = /*#__PURE__*/_react["default"].createRef();
+    return _this;
+  }
+  var _proto = ZDataTableContainer.prototype;
+  _proto.render = function render() {
+    return /*#__PURE__*/_react["default"].createElement(ZDataTable, (0, _extends2["default"])({}, this.props, {
+      ref: this.chartRef
+    }));
+  };
+  return ZDataTableContainer;
+}(_react["default"].Component);
+exports["default"] = ZDataTableContainer;

package/lib/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/lib/components/z-data-table/index.js

@@ -0,0 +1,14 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports["default"] = exports.TableRenderer = exports.LinkRenderer = exports.CustomRenderer = void 0;
+var _dataTable = _interopRequireDefault(require("./data-table"));
+var _tableRenderer = _interopRequireDefault(require("./components/table-renderer"));
+exports.TableRenderer = _tableRenderer["default"];
+var _customRenderer = _interopRequireDefault(require("./components/custom-renderer"));
+exports.CustomRenderer = _customRenderer["default"];
+var _linkRenderer = _interopRequireDefault(require("./components/link-renderer"));
+exports.LinkRenderer = _linkRenderer["default"];
+var _default = _dataTable["default"];
+exports["default"] = _default;

package/lib/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/lib/components/z-templates-data-common/components/chart-renderer/index.js

@@ -6,9 +6,8 @@ exports["default"] = void 0;
 var _tabs = _interopRequireDefault(require("antd/lib/tabs"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireWildcard(require("react"));
-var _dataCommon = require("../../data-common.helper");
-var _tableRenderer = _interopRequireDefault(require("../table-renderer"));
-var _customRenderer = _interopRequireDefault(require("../custom-renderer"));
+var _dataTable = require("../../../z-data-table/data-table.helper");
+var _zDataTable = require("../../../z-data-table");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var ChartRenderer = function ChartRenderer(_ref) {
@@ -47,7 +46,7 @@ var ChartRenderer = function ChartRenderer(_ref) {
       if (chartSetting.length) {
         var index = 0;
         var item = chartSetting[index];
-        setActiveKey("" + (item === null || item === void 0 ? void 0 : item.dataSetName) + _dataCommon.separator + index);
+        setActiveKey("" + (item === null || item === void 0 ? void 0 : item.dataSetName) + _dataTable.separator + index);
       }
     }
   }, []);
@@ -75,8 +74,14 @@ var ChartRenderer = function ChartRenderer(_ref) {
 
   // 普通列表json对象
   if (isObject) {
-    return /*#__PURE__*/_react["default"].createElement(_tableRenderer["default"], (0, _extends2["default"])({}, chartSetting, {
-      activeKey: activeKey,
+    return chartSetting !== null && chartSetting !== void 0 && chartSetting.custom ? /*#__PURE__*/_react["default"].createElement(_zDataTable.CustomRenderer, (0, _extends2["default"])({}, chartSetting, {
+      currentKey: activeKey,
+      chartRef: function chartRef(ref) {
+        _chartRef.current[chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName] = ref;
+      },
+      onConfirm: onConfirm
+    })) : /*#__PURE__*/_react["default"].createElement(_zDataTable.TableRenderer, (0, _extends2["default"])({}, chartSetting, {
+      currentKey: activeKey,
       chartRef: function chartRef(ref) {
         _chartRef.current[chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.dataSetName] = ref;
       },
@@ -91,20 +96,20 @@ var ChartRenderer = function ChartRenderer(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_tabs["default"], {
       activeKey: activeKey,
       onChange: handleTabsChange
-    }, chartSetting.map(function (e, i) {
+    }, chartSetting === null || chartSetting === void 0 ? void 0 : chartSetting.map(function (e, i) {
       return /*#__PURE__*/_react["default"].createElement(_tabs["default"].TabPane, {
         tab: "" + ((e === null || e === void 0 ? void 0 : e.title) || ''),
-        key: "" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataCommon.separator + i.toString()
-      }, e !== null && e !== void 0 && e.custom ? /*#__PURE__*/_react["default"].createElement(_customRenderer["default"], (0, _extends2["default"])({}, e, {
-        activeKey: activeKey,
+        key: "" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataTable.separator + i.toString()
+      }, e !== null && e !== void 0 && e.custom ? /*#__PURE__*/_react["default"].createElement(_zDataTable.CustomRenderer, (0, _extends2["default"])({}, e, {
+        currentKey: activeKey,
         chartRef: function chartRef(ref) {
-          _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataCommon.separator + i] = ref;
+          _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataTable.separator + i] = ref;
         },
         onConfirm: onConfirm
-      })) : /*#__PURE__*/_react["default"].createElement(_tableRenderer["default"], (0, _extends2["default"])({}, e, {
-        activeKey: activeKey,
+      })) : /*#__PURE__*/_react["default"].createElement(_zDataTable.TableRenderer, (0, _extends2["default"])({}, e, {
+        currentKey: activeKey,
         chartRef: function chartRef(ref) {
-          _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataCommon.separator + i] = ref;
+          _chartRef.current["" + (e === null || e === void 0 ? void 0 : e.dataSetName) + _dataTable.separator + i] = ref;
         },
         onConfirm: onConfirm
       })));

package/lib/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> {