@zat-design/sisyphus-react 3.6.9-beta.4 → 3.6.9-beta.7

package/dist/index.esm.css

@@ -3045,7 +3045,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .pro-form-item-changed .ant-picker input,
 .pro-form .pro-form-item-changed .ant-input-number input {
-  background: transparent;
+  background: transparent !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,

package/dist/less.esm.css

@@ -3045,7 +3045,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .pro-form-item-changed .ant-picker input,
 .pro-form .pro-form-item-changed .ant-input-number input {
-  background: transparent;
+  background: transparent !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,

package/es/ProEditTable/components/RenderField/index.js

@@ -544,6 +544,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       equalWith: equalWith,
       type: type,
+      onChange: _onChange,
       children: FieldComponent
     });
   }

package/es/ProForm/components/render/Render.js

@@ -427,11 +427,8 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
-      // @ts-ignore
-      _internalItemRender: internalItemRender,
-      className: _className,
-      children: _jsx(Changed, {
+    if (originalValues) {
+      child = _jsx(Changed, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
@@ -440,8 +437,15 @@ var Render = function Render(props) {
         equalWith: equalWith,
         originalDiffTip: originalDiffTip,
         type: type,
+        onChange: handleChange,
         children: child
-      })
+      });
+    }
+    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: _className,
+      children: child
     }));
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
@@ -457,17 +461,7 @@ var Render = function Render(props) {
               // @ts-ignore
               _internalItemRender: internalItemRender,
               className: _className,
-              children: _jsx(Changed, {
-                name: formItemProps.name,
-                names: otherProps.names,
-                namesStr: namesStr,
-                originalValues: originalValues,
-                form: form,
-                equalWith: equalWith,
-                originalDiffTip: originalDiffTip,
-                type: type,
-                children: child
-              })
+              children: child
             }));
           }
         })

package/es/ProForm/style/index.less

@@ -331,7 +331,7 @@
       background: @zaui-contract-bg !important;
 
       input {
-        background: transparent;
+        background: transparent !important;
       }
       .@{ant-prefix}-select-selection-placeholder {
         z-index: 9;

package/es/ProForm/utils/index.d.ts

@@ -50,12 +50,6 @@ export declare const isNullArray: (arr: any) => boolean;
  */
 export declare const isEmptyArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export declare function processHyphenKeys(obj: AnyObject): AnyObject;
 /**
  * 初始化值names值合并
  * @param obj AnyObject

package/es/ProForm/utils/index.js

@@ -1,11 +1,10 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import moment from 'moment';
-import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
+import _, { isObject, isFunction, get, set, omit, isNaN } from 'lodash';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -249,54 +248,6 @@ export function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export function processHyphenKeys(obj) {
-  var newObj = _objectSpread({}, obj);
-  var keys = Object.keys(obj);
-  for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-    var key = _keys[_i];
-    if (key.includes('-')) {
-      var keyParts = key.split('-');
-      var shouldCombine = true;
-      var combinedArray = [];
-      var _iterator = _createForOfIteratorHelper(keyParts),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var part = _step.value;
-          if (obj.hasOwnProperty(part)) {
-            combinedArray.push(obj[part]);
-          } else {
-            shouldCombine = false;
-            break;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      if (shouldCombine) {
-        newObj[key] = combinedArray;
-      } else {
-        newObj[key] = undefined;
-      }
-    }
-    // 匹配数组的namePath,只匹配到1层
-    if (key.includes('_')) {
-      var _keyParts = key.split('_')[0];
-      // 校验值是否存在，解决names多传额外空值报错
-      newObj[key] = isObject(newObj[_keyParts]) ? Object.values(newObj[_keyParts]).filter(function (val) {
-        return val !== null && val !== undefined && val !== '';
-      }) : [];
-    }
-  }
-  return cloneDeep(newObj);
-}
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -464,11 +415,11 @@ export var parseNamePath = function parseNamePath(input) {
 };
 /** 解析namePath */
 export function findNamesKeyInArray(arr, key) {
-  var _iterator2 = _createForOfIteratorHelper(arr),
-    _step2;
+  var _iterator = _createForOfIteratorHelper(arr),
+    _step;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
       if (!item.includes('_')) {
         return null;
       }
@@ -477,9 +428,9 @@ export function findNamesKeyInArray(arr, key) {
       }
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return null;
 }

package/es/ProTable/components/FormatColumn/index.js

@@ -191,6 +191,22 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
+        var _column$codeValues$fi;
+        var labelName = column === null || column === void 0 ? void 0 : (_column$codeValues$fi = column.codeValues.find(function (item) {
+          return item.value === value;
+        })) === null || _column$codeValues$fi === void 0 ? void 0 : _column$codeValues$fi.label;
+        if (valueType === 'enumName') {
+          renderValue = _jsx(_Fragment, {
+            children: labelName || '-'
+          });
+        }
+        if (valueType === 'enumCodeName') {
+          renderValue = _jsx(_Fragment, {
+            children: labelName ? "".concat(value, "-").concat(labelName) : labelName
+          });
+        }
+      }
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/es/ProTable/propsType.d.ts

@@ -26,6 +26,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     format?: string;
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
+    codeValues?: {
+        label: string;
+        value: string | number;
+    }[];
     copyable?: boolean;
     originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);

package/lib/ProEditTable/components/RenderField/index.js

@@ -551,6 +551,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       equalWith: equalWith,
       type: type,
+      onChange: _onChange,
       children: FieldComponent
     });
   }

package/lib/ProForm/components/render/Render.js

@@ -427,11 +427,8 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-      // @ts-ignore
-      _internalItemRender: internalItemRender,
-      className: _className,
-      children: (0, _jsxRuntime.jsx)(_Changed.default, {
+    if (originalValues) {
+      child = (0, _jsxRuntime.jsx)(_Changed.default, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
@@ -440,8 +437,15 @@ var Render = function Render(props) {
         equalWith: equalWith,
         originalDiffTip: originalDiffTip,
         type: type,
+        onChange: handleChange,
         children: child
-      })
+      });
+    }
+    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: _className,
+      children: child
     }));
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
@@ -457,17 +461,7 @@ var Render = function Render(props) {
               // @ts-ignore
               _internalItemRender: internalItemRender,
               className: _className,
-              children: (0, _jsxRuntime.jsx)(_Changed.default, {
-                name: formItemProps.name,
-                names: otherProps.names,
-                namesStr: namesStr,
-                originalValues: originalValues,
-                form: form,
-                equalWith: equalWith,
-                originalDiffTip: originalDiffTip,
-                type: type,
-                children: child
-              })
+              children: child
             }));
           }
         })

package/lib/ProForm/style/index.less

@@ -331,7 +331,7 @@
       background: @zaui-contract-bg !important;
 
       input {
-        background: transparent;
+        background: transparent !important;
       }
       .@{ant-prefix}-select-selection-placeholder {
         z-index: 9;

package/lib/ProForm/utils/index.d.ts

@@ -50,12 +50,6 @@ export declare const isNullArray: (arr: any) => boolean;
  */
 export declare const isEmptyArray: (arr: any) => boolean;
 export declare function toArray<T>(value?: T | T[] | null): T[];
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export declare function processHyphenKeys(obj: AnyObject): AnyObject;
 /**
  * 初始化值names值合并
  * @param obj AnyObject

package/lib/ProForm/utils/index.js

@@ -11,14 +11,11 @@ exports.getAllNamePath = exports.findOptionByValue = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
-exports.parseNamePath = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isEmptyArray = void 0;
-exports.processHyphenKeys = processHyphenKeys;
-exports.splitNameStr = void 0;
+exports.splitNameStr = exports.parseNamePath = exports.isUpperCase = exports.isTrim = exports.isSelect = exports.isNullValue = exports.isNullArray = exports.isNotFullArray = exports.isEmptyArray = void 0;
 exports.toArray = toArray;
 exports.weedOutProps = exports.view = exports.useControlled = void 0;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -265,54 +262,6 @@ function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-function processHyphenKeys(obj) {
-  var newObj = (0, _objectSpread2.default)({}, obj);
-  var keys = Object.keys(obj);
-  for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-    var key = _keys[_i];
-    if (key.includes('-')) {
-      var keyParts = key.split('-');
-      var shouldCombine = true;
-      var combinedArray = [];
-      var _iterator = (0, _createForOfIteratorHelper2.default)(keyParts),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var part = _step.value;
-          if (obj.hasOwnProperty(part)) {
-            combinedArray.push(obj[part]);
-          } else {
-            shouldCombine = false;
-            break;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      if (shouldCombine) {
-        newObj[key] = combinedArray;
-      } else {
-        newObj[key] = undefined;
-      }
-    }
-    // 匹配数组的namePath,只匹配到1层
-    if (key.includes('_')) {
-      var _keyParts = key.split('_')[0];
-      // 校验值是否存在，解决names多传额外空值报错
-      newObj[key] = (0, _lodash.isObject)(newObj[_keyParts]) ? Object.values(newObj[_keyParts]).filter(function (val) {
-        return val !== null && val !== undefined && val !== '';
-      }) : [];
-    }
-  }
-  return (0, _lodash.cloneDeep)(newObj);
-}
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -478,11 +427,11 @@ var parseNamePath = exports.parseNamePath = function parseNamePath(input) {
 };
 /** 解析namePath */
 function findNamesKeyInArray(arr, key) {
-  var _iterator2 = (0, _createForOfIteratorHelper2.default)(arr),
-    _step2;
+  var _iterator = (0, _createForOfIteratorHelper2.default)(arr),
+    _step;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
       if (!item.includes('_')) {
         return null;
       }
@@ -491,9 +440,9 @@ function findNamesKeyInArray(arr, key) {
       }
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return null;
 }

package/lib/ProTable/components/FormatColumn/index.js

@@ -197,6 +197,22 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalValue = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
+        var _column$codeValues$fi;
+        var labelName = column === null || column === void 0 ? void 0 : (_column$codeValues$fi = column.codeValues.find(function (item) {
+          return item.value === value;
+        })) === null || _column$codeValues$fi === void 0 ? void 0 : _column$codeValues$fi.label;
+        if (valueType === 'enumName') {
+          renderValue = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+            children: labelName || '-'
+          });
+        }
+        if (valueType === 'enumCodeName') {
+          renderValue = (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+            children: labelName ? "".concat(value, "-").concat(labelName) : labelName
+          });
+        }
+      }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/lib/ProTable/propsType.d.ts

@@ -26,6 +26,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     format?: string;
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
+    codeValues?: {
+        label: string;
+        value: string | number;
+    }[];
     copyable?: boolean;
     originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.9-beta.4",
+  "version": "3.6.9-beta.7",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",