@ztocwst/rc-pro-materials 0.2.22 → 0.2.24

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

@@ -2,7 +2,7 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutP
 import _extends from "@babel/runtime/helpers/extends";
 import _Table from "antd/es/table";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-var _excluded = ["pageNum", "pageSize"];
+var _excluded = ["pageNum", "pageSize", "orderBy"];
 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); }
 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; }
@@ -10,13 +10,13 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useRef, useState, useEffect, useImperativeHandle, useContext } from 'react';
 import { ProTable, RcConfigContext } from '@ztocwst/rc-pro';
 import moment from 'moment';
-import { tableConfigDefault, dateStart, separator, timeUnit, getType, handleQueryParams, getReportData } from "../../data-common.helper";
+import { tableConfigDefault, dateStart, separator, timeUnit, defaultSort, getType, handleQueryParams, getReportData } from "../../data-table.helper";
 import { handleColumns, handleValueFormat, getDimTargetData } from "./table-renderer.helper";
 import DimTarget from "../dim-target";
 import LinkRenderer from "../link-renderer";
 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,
@@ -78,6 +78,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: {
@@ -188,7 +191,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) {
@@ -222,7 +225,7 @@ var TableRenderer = function TableRenderer(props) {
         }
       });
     }
-
+    var orderBys = [];
     /** 维度收集 */
     var dim = [];
     for (var _iterator = _createForOfIteratorHelperLoose(dimensionSource), _step; !(_step = _iterator()).done;) {
@@ -232,6 +235,12 @@ var TableRenderer = function TableRenderer(props) {
           name: cur.name,
           description: cur.description
         });
+        if (cur !== null && cur !== void 0 && cur.sorted) {
+          orderBys.push({
+            name: cur.description,
+            sort: defaultSort
+          });
+        }
       }
     }
 
@@ -243,18 +252,41 @@ var TableRenderer = function TableRenderer(props) {
         target.push({
           description: _cur.name
         });
+        if (_cur !== null && _cur !== void 0 && _cur.sorted) {
+          orderBys.push({
+            name: _cur.name,
+            sort: defaultSort
+          });
+        }
       }
     }
     var queryParams = handleQueryParams(query);
     var _params = params,
       pageNum = _params.pageNum,
       pageSize = _params.pageSize,
+      orderBy = _params.orderBy,
       other = _objectWithoutPropertiesLoose(_params, _excluded);
+    if (orderBy !== null && orderBy !== void 0 && orderBy.length) {
+      var _loop = function _loop() {
+        var item = _step3.value;
+        var i = orderBys.findIndex(function (e) {
+          return e.name === item.name;
+        });
+        if (i > -1) {
+          orderBys.splice(i, 1);
+        }
+        orderBys.unshift(_extends({}, item));
+      };
+      for (var _iterator3 = _createForOfIteratorHelperLoose(orderBy), _step3; !(_step3 = _iterator3()).done;) {
+        _loop();
+      }
+    }
     var data = _extends({
-      queryParams: queryParams,
-      dim: dim,
-      target: target
+      queryParams: queryParams
     }, other, {
+      dim: dim,
+      target: target,
+      orderBy: orderBys !== null && orderBys !== void 0 && orderBys.length ? orderBys : undefined,
       pageNum: pageNum || 1,
       pageSize: pageSize || defaultPageSize,
       dataSetName: dataSetName
@@ -380,27 +412,36 @@ var TableRenderer = function TableRenderer(props) {
       timer = null;
     }
   };
-  useEffect(function () {
-    var _ref6 = (activeKey === null || activeKey === void 0 ? void 0 : activeKey.split(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 * 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 * timeUnit);
+      } else {
+        onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm();
       }
     } else {
       handleClearInterval();
     }
+  };
+  useEffect(function () {
+    if (currentKey) {
+      var _ref6 = currentKey.split(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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(value) {
       var _linkChartRef$current3;
@@ -413,7 +454,7 @@ var TableRenderer = function TableRenderer(props) {
               queryCacheRef.current = value[dataSetName] || value;
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
                 var _tableRef$current2;
-                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator3, _step3, cur, _ref9, success, _ref9$result, result, _result$data, _result$data$, data;
+                var _getDimTargetValues4, _getDimTargetValues4$, indexSource, indexAmounted, target, _iterator4, _step4, cur, _ref9, success, _ref9$result, result, _result$data, _result$data$, data;
                 return _regeneratorRuntime.wrap(function _callee5$(_context5) {
                   while (1) switch (_context5.prev = _context5.next) {
                     case 0:
@@ -429,8 +470,8 @@ var TableRenderer = function TableRenderer(props) {
                         break;
                       }
                       target = [];
-                      for (_iterator3 = _createForOfIteratorHelperLoose(indexAmounted); !(_step3 = _iterator3()).done;) {
-                        cur = _step3.value;
+                      for (_iterator4 = _createForOfIteratorHelperLoose(indexAmounted); !(_step4 = _iterator4()).done;) {
+                        cur = _step4.value;
                         target.push({
                           description: cur.name
                         });

package/es/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/es/components/{z-templates-data-common → z-data-table}/components/table-renderer/table-renderer.helper.js

@@ -6,7 +6,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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); }
 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; }
-import { separator, computeWidth, handleDecimal, handleThousand, handlePercent, handleLink, handleCondition, getDimTarget } from "../../data-common.helper";
+import { separator, defaultSort, computeWidth, handleDecimal, handleThousand, handlePercent, handleLink, handleCondition, getDimTarget } from "../../data-table.helper";
 export var stringTrim = function stringTrim(str) {
   if (!str) return '';
   return str.replace(/`|'|"/g, '');
@@ -176,37 +176,47 @@ export var handleValueFormat = function handleValueFormat(value, record, config,
  */
 export 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 = 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 = 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(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(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 + separator + link.title === config.link;
       });
@@ -215,12 +225,13 @@ export var handleColumns = function handleColumns(option, expressions, linkPage,
       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) || 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) || 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/es/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/es/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/es/components/{z-templates-data-common/data-common.helper.js → z-data-table/data-table.helper.js}

@@ -26,6 +26,9 @@ export var timeUnit = 60 * 1000;
 /** 介于 前闭后开 */
 export var BETWEEN = '<=,<';
 
+/** 默认排序 */
+export var defaultSort = 'asc';
+
 /** 数据类型 */
 
 /**
@@ -172,7 +175,7 @@ export var handleCondition = function handleCondition(value, handledValue, condi
 };
 
 // mock
-var token = 'scm:tenant:token:2:104:DB0D80CD71B76AF4A8858729478BA945';
+var token = 'scm:tenant:token:2:104:CCAB6974939D70D8418CBEC342EAE22D';
 
 /** 获取维度指标 */
 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,
@@ -68,8 +67,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 +89,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;
         },