@ztocwst/rc-pro-materials 0.2.25 → 0.2.27

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

@@ -1,12 +1,12 @@
-import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
+import _extends from "@babel/runtime/helpers/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 var _excluded = ["isFixed", "fixed", "render"];
 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, defaultSort, computeWidth, handleDecimal, handleThousand, handlePercent, handleLink, handleCondition, getDimTarget } from "../../data-table.helper";
+import { separator, defaultSort, computeWidth, getType, handleDecimal, handleThousand, handlePercent, handleLink, handleCondition, getDimTarget } from "../../data-table.helper";
 export var stringTrim = function stringTrim(str) {
   if (!str) return '';
   return str.replace(/`|'|"/g, '');
@@ -167,71 +167,62 @@ export var handleValueFormat = function handleValueFormat(value, record, config,
   return (_val = val) !== null && _val !== void 0 ? _val : "-";
 };
 
-/**
- * 条件格式
- */
-
 /**
  * 根据维度指标获取表格列
  */
-export var handleColumns = function handleColumns(option, expressions, linkPage, onLink) {
+export var handleColumns = function handleColumns(option, linkPage, onLink) {
   var _option$actionJson;
-  var isFirst = true;
+  // let isFirst = true
   var dimTarget = [].concat(option.dimension, option.index);
   var columns = dimTarget.map(function (title) {
-    var _config5, _config5$link, _config6, _config7, _config8, _title$toString, _config9, _config10, _config11;
+    var _config3, _config3$link, _config4, _config5, _config6, _config6$otherProps, _config7, _config8, _config9, _config10, _config11, _title$toString, _config12, _config13, _config14;
     var config;
     var dataIndex;
-    var defaultSortOrder;
     var condition;
     if (!config) {
-      var _option$dimensionSour, _config, _config2;
+      var _option$dimensionSour, _config;
       /* 通过别名或名称 查找当前维度的配置 */
       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?.sorted && isFirst){
+      //   isFirst = false
+      // }
     }
+
     if (!config) {
-      var _option$indexSource, _config3, _config4;
+      var _option$indexSource, _config2;
       /* 通过别名或名称 查找当前指标的配置 */
       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 = (_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";
-      }
+      dataIndex = (_config2 = config) === null || _config2 === void 0 ? void 0 : _config2.name;
+      // if(config?.sorted && isFirst){
+      //   isFirst = false
+      // }
     }
-    /* 条件格式设置 */
-    // if (expressions?.length) {
-    //   condition = expressions?.filter((item) => item?.index?.includes(config?.name));
-    // }
 
-    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)) || [],
+    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)) || [],
       dataSetName = _ref4[0];
     var index;
-    if ((_config6 = config) !== null && _config6 !== void 0 && _config6.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
+    if ((_config4 = config) !== null && _config4 !== void 0 && _config4.link && linkPage !== null && linkPage !== void 0 && linkPage.length) {
       index = linkPage.findIndex(function (link) {
         return "" + link.dataSetName + separator + link.title === config.link;
       });
     }
-    return {
+    var other = _extends({}, getType((_config5 = config) === null || _config5 === void 0 ? void 0 : _config5.otherProps) === 'function' ? (_config6 = config) === null || _config6 === void 0 ? void 0 : (_config6$otherProps = _config6.otherProps) === null || _config6$otherProps === void 0 ? void 0 : _config6$otherProps.call(_config6) : (_config7 = config) === null || _config7 === void 0 ? void 0 : _config7.otherProps);
+    return _extends({}, other, {
       title: title,
       dataIndex: dataIndex,
       ellipsis: true,
-      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,
+      sorter: (_config8 = config) === null || _config8 === void 0 ? void 0 : _config8.sorted,
+      defaultSortOrder: (_config9 = config) !== null && _config9 !== void 0 && _config9.sorted ? ((_config10 = config) === null || _config10 === void 0 ? void 0 : _config10.defaultSorted) || defaultSort + "end" : undefined,
+      width: ((_config11 = config) === null || _config11 === void 0 ? void 0 : _config11.width) || computeWidth(title === null || title === void 0 ? void 0 : (_title$toString = title.toString()) === null || _title$toString === void 0 ? void 0 : _title$toString.length),
+      fixed: (_config12 = config) !== null && _config12 !== void 0 && _config12.isFixed ? ((_config13 = config) === null || _config13 === void 0 ? void 0 : _config13.fixed) || ((_config14 = config) === null || _config14 === void 0 ? void 0 : _config14.isFixed) : false,
       render: function render(value, record) {
-        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 () {
+        var _config$render, _config15;
+        return config.custom ? (_config$render = (_config15 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config15, value, record, config, condition) : handleValueFormat(value, record, config, condition, function () {
           return onLink({
             dataSetName: dataSetName,
             index: index,
@@ -239,7 +230,7 @@ export var handleColumns = function handleColumns(option, expressions, linkPage,
           });
         });
       }
-    };
+    });
   });
   if (option !== null && option !== void 0 && (_option$actionJson = option.actionJson) !== null && _option$actionJson !== void 0 && _option$actionJson.custom) {
     var _columns$fn;

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

@@ -20,6 +20,8 @@ export interface TypeTargetProps {
     percent: boolean;
     /** 是否允许排序 */
     sorted: boolean;
+    /** 默认排序 */
+    defaultSorted?: string;
     /** 宽度 */
     width: number;
     /** 是否合计 */
@@ -91,7 +93,6 @@ export interface TypeZDataTableProps {
         menuId: string;
     };
     /** 条件格式设置 */
-    expressions?: any[] | [];
     linkPageTitle?: string;
     /** 下钻二级页设置 */
     linkPage?: TypeZDataTableProps[];

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

@@ -3,6 +3,7 @@
 export declare const tableConfigDefault: {
     manual: boolean;
     toolBars: boolean;
+    resizable: boolean;
     hideDefRowSelection: boolean;
     columns: any[];
 };

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

@@ -10,6 +10,7 @@ import rcProRequest from "../../utils/rcProRequest";
 export var tableConfigDefault = {
   manual: true,
   toolBars: false,
+  resizable: false,
   hideDefRowSelection: true,
   columns: []
 };
@@ -175,7 +176,7 @@ export var handleCondition = function handleCondition(value, handledValue, condi
 };
 
 // mock
-var token = 'scm:tenant:token:2:104:7c454641-c65c-4459-b5a3-d4be9fb16ffd';
+var token = 'scm:tenant:token:2:104:9e53d7bb-7dac-4e2e-a371-060007dc9f76';
 
 /** 获取维度指标 */
 export var getDimTarget = /*#__PURE__*/function () {

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

@@ -45,80 +45,110 @@ var CustomRenderer = function CustomRenderer(props) {
     setIsLink(true);
     (_linkChartRef$current = linkChartRef.current) === null || _linkChartRef$current === void 0 ? void 0 : (_linkChartRef$current2 = _linkChartRef$current.initial) === null || _linkChartRef$current2 === void 0 ? void 0 : _linkChartRef$current2.call(_linkChartRef$current, (0, _extends2["default"])({}, values));
   };
+  var getBigDataBody = function getBigDataBody(params) {
+    var _indexJson$data;
+    if (params === void 0) {
+      params = {};
+    }
+    var target = [];
+    if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
+      for (var _iterator = _createForOfIteratorHelperLoose(indexJson.data), _step; !(_step = _iterator()).done;) {
+        var item = _step.value;
+        target.push({
+          description: item.name
+        });
+      }
+    }
+    var queryParams = (0, _dataTable.handleQueryParams)(params);
+    var data = {
+      target: target,
+      queryParams: queryParams,
+      dataSetName: dataSetName
+    };
+    return formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data;
+  };
 
   // 获取数据源
   var getDataSource = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(query) {
-      var _indexJson$data, target, _iterator, _step, item, queryParams, data, res;
+      var data, _ref3, success, _ref3$result, _result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (query === void 0) {
               query = {};
             }
-            _context.prev = 1;
-            target = [];
-            if (indexJson !== null && indexJson !== void 0 && (_indexJson$data = indexJson.data) !== null && _indexJson$data !== void 0 && _indexJson$data.length) {
-              for (_iterator = _createForOfIteratorHelperLoose(indexJson.data); !(_step = _iterator()).done;) {
-                item = _step.value;
-                target.push({
-                  description: item.name
-                });
-              }
+            if (!loading) {
+              _context.next = 3;
+              break;
             }
-            queryParams = (0, _dataTable.handleQueryParams)(query);
-            data = {
-              target: target,
-              queryParams: queryParams,
-              dataSetName: dataSetName
-            };
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(query);
             setLoading(true);
-            _context.next = 9;
-            return (0, _dataTable.getReportData)(rcProContext, formatter ? formatter === null || formatter === void 0 ? void 0 : formatter(data) : data);
-          case 9:
-            res = _context.sent;
+            _context.next = 8;
+            return (0, _dataTable.getReportData)(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref3 = _context.t0;
+            success = _ref3.success;
+            _ref3$result = _ref3.result;
+            _result = _ref3$result === void 0 ? {} : _ref3$result;
             setLoading(false);
-            if (res !== null && res !== void 0 && res.success) {
-              setResult(res === null || res === void 0 ? void 0 : res.result);
+            if (success) {
+              setResult(_result);
+            } else {
+              setResult(null);
             }
-            _context.next = 19;
+            _context.next = 24;
             break;
-          case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](1);
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](3);
             setLoading(false);
             setResult(null);
-            console.error(_context.t0);
-          case 19:
+            console.error(_context.t1);
+          case 24:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 14]]);
+      }, _callee, null, [[3, 19]]);
     }));
     return function getDataSource(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   var queryChart = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
-      var queryParams, _linkChartRef$current3;
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(value) {
+      var _value;
+      var queryParams, _linkChartRef$current3, _linkChartRef$current4;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            queryParams = value[dataSetName] || value;
+            if (value === void 0) {
+              value = {};
+            }
+            queryParams = ((_value = value) === null || _value === void 0 ? void 0 : _value[dataSetName]) || value;
             if (isLink) {
-              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : _linkChartRef$current3.queryChart(queryParams);
+              (_linkChartRef$current3 = linkChartRef.current) === null || _linkChartRef$current3 === void 0 ? void 0 : (_linkChartRef$current4 = _linkChartRef$current3.queryChart) === null || _linkChartRef$current4 === void 0 ? void 0 : _linkChartRef$current4.call(_linkChartRef$current3, queryParams);
             } else {
               getDataSource(queryParams);
             }
-          case 2:
+          case 3:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
     return function queryChart(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var handleClearInterval = function handleClearInterval() {
@@ -143,8 +173,8 @@ var CustomRenderer = function CustomRenderer(props) {
   };
   (0, _react.useEffect)(function () {
     if (currentKey) {
-      var _ref4 = currentKey.split(_dataTable.separator) || [],
-        curDataSetName = _ref4[0];
+      var _ref5 = currentKey.split(_dataTable.separator) || [],
+        curDataSetName = _ref5[0];
       if (curDataSetName === dataSetName) {
         onload();
       } else {

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

@@ -200,9 +200,10 @@ var LinkRenderer = function LinkRenderer(props) {
       for (var _iterator = _createForOfIteratorHelperLoose(targets.indexSource), _step; !(_step = _iterator()).done;) {
         var cur = _step.value;
         if (cur !== null && cur !== void 0 && cur.sorted) {
+          var _cur$defaultSorted;
           orderBys.push({
             name: cur.name,
-            sort: _dataTable.defaultSort
+            sort: cur.defaultSorted ? (_cur$defaultSorted = cur.defaultSorted) === null || _cur$defaultSorted === void 0 ? void 0 : _cur$defaultSorted.slice(0, -3) : _dataTable.defaultSort
           });
         }
       }
@@ -245,42 +246,57 @@ var LinkRenderer = function LinkRenderer(props) {
   };
   var getDataSource = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(params) {
-      var queryData;
+      var data, _ref5, success, _ref5$result, _result;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (params === void 0) {
               params = {};
             }
-            queryData = getBigDataBody(params);
+            if (!loading) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return");
+          case 3:
+            _context.prev = 3;
+            data = getBigDataBody(params); // 自定义、非自定义都打开 loading 拦截重复请求
+            setLoading(true);
+            _context.next = 8;
+            return (0, _dataTable.getReportData)(rcProContext, data);
+          case 8:
+            _context.t0 = _context.sent;
+            if (_context.t0) {
+              _context.next = 11;
+              break;
+            }
+            _context.t0 = {};
+          case 11:
+            _ref5 = _context.t0;
+            success = _ref5.success;
+            _ref5$result = _ref5.result;
+            _result = _ref5$result === void 0 ? {} : _ref5$result;
+            setLoading(false);
             if (linkState.custom) {
-              setLoading(true);
+              setResult(_result);
             }
-            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;
-              if (linkState.custom) {
-                setLoading(false);
-                if (success) {
-                  setResult(result);
-                }
-              }
-              return {
-                success: success,
-                result: result
-              };
-            })["catch"](function () {
-              if (linkState.custom) {
-                setLoading(false);
-                setResult(null);
-              }
-            }));
-          case 4:
+            return _context.abrupt("return", {
+              success: success,
+              result: _result
+            });
+          case 20:
+            _context.prev = 20;
+            _context.t1 = _context["catch"](3);
+            setLoading(false);
+            if (linkState.custom) {
+              setResult(null);
+            }
+            console.error(_context.t1);
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[3, 20]]);
     }));
     return function getDataSource(_x) {
       return _ref4.apply(this, arguments);
@@ -339,6 +355,9 @@ var LinkRenderer = function LinkRenderer(props) {
     setLinkState(stateData);
   };
   var queryChart = function queryChart(value) {
+    if (value === void 0) {
+      value = {};
+    }
     queryCacheRef.current = value;
     if (linkState.custom) {
       getDataSource({