@ztocwst/rc-pro-materials 0.2.27 → 0.2.28

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

@@ -46,7 +46,7 @@ export declare const getDimTargetData: (rcProContext: any, params: Record<string
 /**
  * 数据渲染格式处理
  */
-export declare const handleValueFormat: (value: valueType, record: Record<string, any>, config?: Record<string, any>, condition?: any[], onLink?: () => void) => any;
+export declare const handleValueFormat: (value: valueType, record: Record<string, any>, config?: Record<string, any>, onLink?: () => void) => any;
 /**
  * 根据维度指标获取表格列
  */

package/es/components/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, defaultSort, computeWidth, getType, handleDecimal, handleThousand, handlePercent, handleLink, handleCondition, getDimTarget } from "../../data-table.helper";
+import { separator, defaultSort, computeWidth, getType, handleDecimal, handleThousand, handlePercent, handleLink, getDimTarget } from "../../data-table.helper";
 export var stringTrim = function stringTrim(str) {
   if (!str) return '';
   return str.replace(/`|'|"/g, '');
@@ -144,7 +144,7 @@ export var getDimTargetData = /*#__PURE__*/function () {
 /**
  * 数据渲染格式处理
  */
-export var handleValueFormat = function handleValueFormat(value, record, config, condition, onLink) {
+export var handleValueFormat = function handleValueFormat(value, record, config, onLink) {
   var _val;
   var val = value;
   if (typeof value === 'number') {
@@ -161,9 +161,6 @@ export var handleValueFormat = function handleValueFormat(value, record, config,
   if (config !== null && config !== void 0 && config.link) {
     val = handleLink(value, onLink);
   }
-  if (condition !== null && condition !== void 0 && condition.length) {
-    val = handleCondition(value, val, condition);
-  }
   return (_val = val) !== null && _val !== void 0 ? _val : "-";
 };
 
@@ -178,7 +175,6 @@ export var handleColumns = function handleColumns(option, linkPage, onLink) {
     var _config3, _config3$link, _config4, _config5, _config6, _config6$otherProps, _config7, _config8, _config9, _config10, _config11, _title$toString, _config12, _config13, _config14;
     var config;
     var dataIndex;
-    var condition;
     if (!config) {
       var _option$dimensionSour, _config;
       /* 通过别名或名称 查找当前维度的配置 */
@@ -222,7 +218,7 @@ export var handleColumns = function handleColumns(option, linkPage, onLink) {
       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, _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 config.custom ? (_config$render = (_config15 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config15, value, record, config) : handleValueFormat(value, record, config, function () {
           return onLink({
             dataSetName: dataSetName,
             index: index,

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

@@ -14,7 +14,6 @@ export declare const separator = "***";
 /** 时间单位 */
 export declare const timeUnit: number;
 /** 介于 前闭后开 */
-export declare const BETWEEN = "<=,<";
 /** 默认排序 */
 export declare const defaultSort = "asc";
 /** 数据类型 */
@@ -57,12 +56,6 @@ export declare const handlePercent: (value: valueType, decimal?: number, unit?:
  * link外链处理
  */
 export declare const handleLink: (value: valueType, onLink?: () => void) => import("react").JSX.Element;
-/**
- * 条件格式设置
- * @param value 处理前的值
- * @param handledValue 被处理后的值 可能会是link标签
- */
-export declare const handleCondition: (value: valueType, handledValue: any, conditions: any[]) => any;
 /** 获取维度指标 */
 export declare const getDimTarget: (rcProContext: any, params: any) => Promise<any>;
 /** 获取报表数据 */

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

@@ -1,16 +1,13 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/extends";
 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 rcProRequest from "../../utils/rcProRequest";
 
 /** table config  */
 export var tableConfigDefault = {
   manual: true,
   toolBars: false,
-  resizable: false,
+  resizable: true,
   hideDefRowSelection: true,
   columns: []
 };
@@ -25,7 +22,7 @@ export var separator = '***';
 export var timeUnit = 60 * 1000;
 
 /** 介于 前闭后开 */
-export var BETWEEN = '<=,<';
+// export const BETWEEN = '<=,<';
 
 /** 默认排序 */
 export var defaultSort = 'asc';
@@ -108,7 +105,7 @@ export var handleDecimal = function handleDecimal(value, decimal) {
   if (decimal === void 0) {
     decimal = 2;
   }
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return Number(value).toFixed(decimal);
 };
 
@@ -122,7 +119,7 @@ export var handlePercent = function handlePercent(value, decimal, unit) {
   if (unit === void 0) {
     unit = 100;
   }
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return (Number(value) * unit).toFixed(decimal) + "%";
 };
 
@@ -130,50 +127,42 @@ export var handlePercent = function handlePercent(value, decimal, unit) {
  * link外链处理
  */
 export var handleLink = function handleLink(value, onLink) {
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return /*#__PURE__*/React.createElement("a", {
     href: "javascript:void(0);",
     onClick: onLink
   }, value);
 };
 
-/**
- * 条件格式设置
- * @param value 处理前的值
- * @param handledValue 被处理后的值 可能会是link标签
- */
-export var handleCondition = function handleCondition(value, handledValue, conditions) {
-  if (value === null || value === undefined) return;
-  var val = handledValue;
-  for (var _iterator = _createForOfIteratorHelperLoose(conditions), _step; !(_step = _iterator()).done;) {
-    var cur = _step.value;
-    var condition = cur === null || cur === void 0 ? void 0 : cur.condition;
-    if ((condition === null || condition === void 0 ? void 0 : condition.type) === BETWEEN) {
-      var _condition$type;
-      var _condition$type$split = condition === null || condition === void 0 ? void 0 : (_condition$type = condition.type) === null || _condition$type === void 0 ? void 0 : _condition$type.split(','),
-        start = _condition$type$split[0],
-        end = _condition$type$split[1];
-      if (eval("" + (condition === null || condition === void 0 ? void 0 : condition.start) + start + value) && eval("" + value + end + (condition === null || condition === void 0 ? void 0 : condition.end))) {
-        var style = {
-          color: cur === null || cur === void 0 ? void 0 : cur.fontColor,
-          background: cur === null || cur === void 0 ? void 0 : cur.backgroundColor
-        };
-        val = /*#__PURE__*/React.createElement("div", {
-          style: style
-        }, handledValue);
-      }
-    } else if (eval("" + value + (condition === null || condition === void 0 ? void 0 : condition.type) + (condition === null || condition === void 0 ? void 0 : condition.value))) {
-      var _style = {
-        color: cur === null || cur === void 0 ? void 0 : cur.fontColor,
-        background: cur === null || cur === void 0 ? void 0 : cur.backgroundColor
-      };
-      val = /*#__PURE__*/React.createElement("div", {
-        style: _style
-      }, handledValue);
-    }
-  }
-  return val;
-};
+// /**
+//  * 条件格式设置
+//  * @param value 处理前的值
+//  * @param handledValue 被处理后的值 可能会是link标签
+//  */
+// export const handleCondition = (value: valueType, handledValue: any, conditions: any[]) => {
+//   if (value === null || value === undefined) return;
+//   let val: any = handledValue;
+//   for (const cur of conditions) {
+//     const condition = cur?.condition;
+//     if (condition?.type === BETWEEN) {
+//       const [start, end] = condition?.type?.split(',');
+//       if (eval(`${condition?.start}${start}${value}`) && eval(`${value}${end}${condition?.end}`)) {
+//         const style = {
+//           color: cur?.fontColor,
+//           background: cur?.backgroundColor,
+//         };
+//         val = <div style={style}>{handledValue}</div>;
+//       }
+//     } else if (eval(`${value}${condition?.type}${condition?.value}`)) {
+//       const style = {
+//         color: cur?.fontColor,
+//         background: cur?.backgroundColor,
+//       };
+//       val = <div style={style}>{handledValue}</div>;
+//     }
+//   }
+//   return val;
+// };
 
 // mock
 var token = 'scm:tenant:token:2:104:9e53d7bb-7dac-4e2e-a371-060007dc9f76';

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

@@ -46,7 +46,7 @@ export declare const getDimTargetData: (rcProContext: any, params: Record<string
 /**
  * 数据渲染格式处理
  */
-export declare const handleValueFormat: (value: valueType, record: Record<string, any>, config?: Record<string, any>, condition?: any[], onLink?: () => void) => any;
+export declare const handleValueFormat: (value: valueType, record: Record<string, any>, config?: Record<string, any>, onLink?: () => void) => any;
 /**
  * 根据维度指标获取表格列
  */

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

@@ -152,7 +152,7 @@ var getDimTargetData = /*#__PURE__*/function () {
  * 数据渲染格式处理
  */
 exports.getDimTargetData = getDimTargetData;
-var handleValueFormat = function handleValueFormat(value, record, config, condition, onLink) {
+var handleValueFormat = function handleValueFormat(value, record, config, onLink) {
   var _val;
   var val = value;
   if (typeof value === 'number') {
@@ -169,9 +169,6 @@ var handleValueFormat = function handleValueFormat(value, record, config, condit
   if (config !== null && config !== void 0 && config.link) {
     val = (0, _dataTable.handleLink)(value, onLink);
   }
-  if (condition !== null && condition !== void 0 && condition.length) {
-    val = (0, _dataTable.handleCondition)(value, val, condition);
-  }
   return (_val = val) !== null && _val !== void 0 ? _val : "-";
 };
 
@@ -187,7 +184,6 @@ var handleColumns = function handleColumns(option, linkPage, onLink) {
     var _config3, _config3$link, _config4, _config5, _config6, _config6$otherProps, _config7, _config8, _config9, _config10, _config11, _title$toString, _config12, _config13, _config14;
     var config;
     var dataIndex;
-    var condition;
     if (!config) {
       var _option$dimensionSour, _config;
       /* 通过别名或名称 查找当前维度的配置 */
@@ -231,7 +227,7 @@ var handleColumns = function handleColumns(option, linkPage, onLink) {
       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, _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 config.custom ? (_config$render = (_config15 = config).render) === null || _config$render === void 0 ? void 0 : _config$render.call(_config15, value, record, config) : handleValueFormat(value, record, config, function () {
           return onLink({
             dataSetName: dataSetName,
             index: index,

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

@@ -14,7 +14,6 @@ export declare const separator = "***";
 /** 时间单位 */
 export declare const timeUnit: number;
 /** 介于 前闭后开 */
-export declare const BETWEEN = "<=,<";
 /** 默认排序 */
 export declare const defaultSort = "asc";
 /** 数据类型 */
@@ -57,12 +56,6 @@ export declare const handlePercent: (value: valueType, decimal?: number, unit?:
  * link外链处理
  */
 export declare const handleLink: (value: valueType, onLink?: () => void) => import("react").JSX.Element;
-/**
- * 条件格式设置
- * @param value 处理前的值
- * @param handledValue 被处理后的值 可能会是link标签
- */
-export declare const handleCondition: (value: valueType, handledValue: any, conditions: any[]) => any;
 /** 获取维度指标 */
 export declare const getDimTarget: (rcProContext: any, params: any) => Promise<any>;
 /** 获取报表数据 */

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

@@ -2,19 +2,16 @@
 
 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.defaultSort = 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.getType = exports.getReportData = exports.getMaxWidth = exports.getDimTarget = exports.defaultSort = exports.dateStart = exports.computeWidth = 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"));
 var _rcProRequest = _interopRequireDefault(require("../../utils/rcProRequest"));
-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; }
 /** table config  */
 var tableConfigDefault = {
   manual: true,
   toolBars: false,
-  resizable: false,
+  resizable: true,
   hideDefRowSelection: true,
   columns: []
 };
@@ -32,11 +29,10 @@ exports.separator = separator;
 var timeUnit = 60 * 1000;
 
 /** 介于 前闭后开 */
-exports.timeUnit = timeUnit;
-var BETWEEN = '<=,<';
+// export const BETWEEN = '<=,<';
 
 /** 默认排序 */
-exports.BETWEEN = BETWEEN;
+exports.timeUnit = timeUnit;
 var defaultSort = 'asc';
 
 /** 数据类型 */
@@ -122,7 +118,7 @@ var handleDecimal = function handleDecimal(value, decimal) {
   if (decimal === void 0) {
     decimal = 2;
   }
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return Number(value).toFixed(decimal);
 };
 
@@ -137,7 +133,7 @@ var handlePercent = function handlePercent(value, decimal, unit) {
   if (unit === void 0) {
     unit = 100;
   }
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return (Number(value) * unit).toFixed(decimal) + "%";
 };
 
@@ -146,54 +142,45 @@ var handlePercent = function handlePercent(value, decimal, unit) {
  */
 exports.handlePercent = handlePercent;
 var handleLink = function handleLink(value, onLink) {
-  if (value === null || value === undefined) return;
+  if (value === null || value === undefined) return null;
   return /*#__PURE__*/React.createElement("a", {
     href: "javascript:void(0);",
     onClick: onLink
   }, value);
 };
 
-/**
- * 条件格式设置
- * @param value 处理前的值
- * @param handledValue 被处理后的值 可能会是link标签
- */
-exports.handleLink = handleLink;
-var handleCondition = function handleCondition(value, handledValue, conditions) {
-  if (value === null || value === undefined) return;
-  var val = handledValue;
-  for (var _iterator = _createForOfIteratorHelperLoose(conditions), _step; !(_step = _iterator()).done;) {
-    var cur = _step.value;
-    var condition = cur === null || cur === void 0 ? void 0 : cur.condition;
-    if ((condition === null || condition === void 0 ? void 0 : condition.type) === BETWEEN) {
-      var _condition$type;
-      var _condition$type$split = condition === null || condition === void 0 ? void 0 : (_condition$type = condition.type) === null || _condition$type === void 0 ? void 0 : _condition$type.split(','),
-        start = _condition$type$split[0],
-        end = _condition$type$split[1];
-      if (eval("" + (condition === null || condition === void 0 ? void 0 : condition.start) + start + value) && eval("" + value + end + (condition === null || condition === void 0 ? void 0 : condition.end))) {
-        var style = {
-          color: cur === null || cur === void 0 ? void 0 : cur.fontColor,
-          background: cur === null || cur === void 0 ? void 0 : cur.backgroundColor
-        };
-        val = /*#__PURE__*/React.createElement("div", {
-          style: style
-        }, handledValue);
-      }
-    } else if (eval("" + value + (condition === null || condition === void 0 ? void 0 : condition.type) + (condition === null || condition === void 0 ? void 0 : condition.value))) {
-      var _style = {
-        color: cur === null || cur === void 0 ? void 0 : cur.fontColor,
-        background: cur === null || cur === void 0 ? void 0 : cur.backgroundColor
-      };
-      val = /*#__PURE__*/React.createElement("div", {
-        style: _style
-      }, handledValue);
-    }
-  }
-  return val;
-};
+// /**
+//  * 条件格式设置
+//  * @param value 处理前的值
+//  * @param handledValue 被处理后的值 可能会是link标签
+//  */
+// export const handleCondition = (value: valueType, handledValue: any, conditions: any[]) => {
+//   if (value === null || value === undefined) return;
+//   let val: any = handledValue;
+//   for (const cur of conditions) {
+//     const condition = cur?.condition;
+//     if (condition?.type === BETWEEN) {
+//       const [start, end] = condition?.type?.split(',');
+//       if (eval(`${condition?.start}${start}${value}`) && eval(`${value}${end}${condition?.end}`)) {
+//         const style = {
+//           color: cur?.fontColor,
+//           background: cur?.backgroundColor,
+//         };
+//         val = <div style={style}>{handledValue}</div>;
+//       }
+//     } else if (eval(`${value}${condition?.type}${condition?.value}`)) {
+//       const style = {
+//         color: cur?.fontColor,
+//         background: cur?.backgroundColor,
+//       };
+//       val = <div style={style}>{handledValue}</div>;
+//     }
+//   }
+//   return val;
+// };
 
 // mock
-exports.handleCondition = handleCondition;
+exports.handleLink = handleLink;
 var token = 'scm:tenant:token:2:104:9e53d7bb-7dac-4e2e-a371-060007dc9f76';
 
 /** 获取维度指标 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ztocwst/rc-pro-materials",
-  "version": "0.2.27",
+  "version": "0.2.28",
   "description": "@ztocwst/rc-pro-materials",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -22,7 +22,7 @@
     "f2elint-fix": "f2elint fix",
     "dumi": "cross-env APP_ROOT=docs dumi dev",
     "dumi:build": "cross-env APP_ROOT=docs dumi build",
-    "-prepublishOnly": "npm run build && npm run lowcode:build",
+    "prepublishOnly": "npm run build && npm run lowcode:build",
     "ding": "node ./scripts/notify",
     "postpublish": "npm run ding"
   },
@@ -86,11 +86,11 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.27/build/lowcode/assets-prod.json"
+    "materialSchema": "https://npm.ztocwst.com/@ztocwst/rc-pro-materials@0.2.28/build/lowcode/assets-prod.json"
   },
-  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.27/build/index.html",
+  "homepage": "https://unpkg.com/@ztocwst/rc-pro-materials@0.2.28/build/index.html",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   }
-}
+}