@zat-design/sisyphus-react 3.6.8-beta.1 → 3.6.8-beta.11

package/dist/index.esm.css

@@ -1434,7 +1434,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -2516,6 +2516,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
+.pro-modal-select .ant-space-compact .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-btn-compact-last-item {
+  border-left: none;
+}
 .pro-modal-select .ant-input-group-addon,
 .pro-tree-modal .ant-input-group-addon {
   padding: 0px var(--zaui-space-size-sm, 8px);
@@ -2533,6 +2537,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: center;
           align-items: center;
 }
+.ant-form-item-has-error .pro-modal-select .ant-btn-compact-last-item {
+  color: var(--zaui-danger, #ff5050);
+  border-color: var(--zaui-danger, #ff5050);
+}
 .pro-group {
   width: unset !important;
   display: -webkit-box;
@@ -2876,19 +2884,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   fill: var(--zaui-aide-text, #909090);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
   background: transparent;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;

package/dist/less.esm.css

@@ -1434,7 +1434,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -2516,6 +2516,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
+.pro-modal-select .ant-space-compact .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-btn-compact-last-item {
+  border-left: none;
+}
 .pro-modal-select .ant-input-group-addon,
 .pro-tree-modal .ant-input-group-addon {
   padding: 0px var(--zaui-space-size-sm, 8px);
@@ -2533,6 +2537,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: center;
           align-items: center;
 }
+.ant-form-item-has-error .pro-modal-select .ant-btn-compact-last-item {
+  color: var(--zaui-danger, #ff5050);
+  border-color: var(--zaui-danger, #ff5050);
+}
 .pro-group {
   width: unset !important;
   display: -webkit-box;
@@ -2876,19 +2884,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   fill: var(--zaui-aide-text, #909090);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
   background: transparent;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;

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

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -60,8 +60,6 @@ var RenderField = function RenderField(_ref) {
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
-    _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -79,6 +77,8 @@ var RenderField = function RenderField(_ref) {
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
@@ -160,9 +160,7 @@ var RenderField = function RenderField(_ref) {
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = _objectSpread({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
-  });
+  var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';

package/es/ProEditTable/propsType.d.ts

@@ -105,7 +105,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
-    validateTrigger?: string | string[];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
+    validateTrigger?: string | string[];
 }

package/es/ProForm/components/combination/ProCascader/index.js

@@ -260,7 +260,8 @@ var ProCascader = function ProCascader(props) {
       disabled: disabled,
       displayRender: displayRender,
       showSearch: {
-        filter: handlefilter
+        filter: handlefilter,
+        limit: 1000
       },
       onChange: handleChange
     }, omit(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -118,7 +118,9 @@
         }
       }
     }
-    
+    .@{ant-prefix}-btn-compact-last-item{
+      border-left: none;
+    }
   }
 
   .@{ant-prefix}-input-group-addon {
@@ -132,3 +134,13 @@
     }
   }
 }
+
+// 报错信息
+.@{ant-prefix}-form-item-has-error{
+  .pro-modal-select{
+    .ant-btn-compact-last-item{
+      color: @zaui-danger;
+      border-color: @zaui-danger;
+    }
+  }
+}

package/es/ProForm/style/index.less

@@ -119,7 +119,7 @@
     // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
-      .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
       .@{ant-prefix}-picker,
       .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;

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/ProSelect/index.js

@@ -12,7 +12,7 @@ import _Select from "antd/es/select";
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import React, { useImperativeHandle, useState, forwardRef, useRef } from 'react';
+import React, { useImperativeHandle, useState, forwardRef } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
@@ -55,7 +55,6 @@ export var ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
-  var refSelect1 = useRef();
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
@@ -283,7 +282,7 @@ export var ProSelect = function ProSelect(props, ref) {
   }
   return _jsx("div", {
     style: props.style,
-    className: "ant-select-compact-item-div",
+    className: "pro-select",
     children: _jsx(_Select, _objectSpread(_objectSpread({
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,

package/es/ProSelect/index.less

@@ -9,9 +9,9 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
-.ant-select-compact-item-div {
+.pro-select {
   width: 100%;
-  >.ant-select {
+  > .ant-select {
     width: 100%;
   }
 }

package/es/ProStep/style/index.less

@@ -8,7 +8,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;

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/es/global.less

@@ -17,7 +17,7 @@ pre {
 
   // 轨道
   ::-webkit-scrollbar-track {
-    background-color: #fff;
+    background: transparent;
     border-radius: 10px;
   }
 
@@ -51,6 +51,6 @@ pre {
   }
 
   :hover::-webkit-scrollbar-track {
-    background-color: #fff;
+    background: transparent;
   }
 }

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

@@ -30,7 +30,7 @@ var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -63,8 +63,6 @@ var RenderField = function RenderField(_ref) {
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
-    _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -82,6 +80,8 @@ var RenderField = function RenderField(_ref) {
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
@@ -163,9 +163,7 @@ var RenderField = function RenderField(_ref) {
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
-  });
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';

package/lib/ProEditTable/propsType.d.ts

@@ -105,7 +105,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
-    validateTrigger?: string | string[];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
+    validateTrigger?: string | string[];
 }

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -260,7 +260,8 @@ var ProCascader = function ProCascader(props) {
       disabled: disabled,
       displayRender: displayRender,
       showSearch: {
-        filter: handlefilter
+        filter: handlefilter,
+        limit: 1000
       },
       onChange: handleChange
     }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -118,7 +118,9 @@
         }
       }
     }
-    
+    .@{ant-prefix}-btn-compact-last-item{
+      border-left: none;
+    }
   }
 
   .@{ant-prefix}-input-group-addon {
@@ -132,3 +134,13 @@
     }
   }
 }
+
+// 报错信息
+.@{ant-prefix}-form-item-has-error{
+  .pro-modal-select{
+    .ant-btn-compact-last-item{
+      color: @zaui-danger;
+      border-color: @zaui-danger;
+    }
+  }
+}

package/lib/ProForm/style/index.less

@@ -119,7 +119,7 @@
     // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
-      .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
       .@{ant-prefix}-picker,
       .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;

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/ProSelect/index.js

@@ -56,7 +56,6 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var refSelect1 = (0, _react.useRef)();
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
@@ -284,7 +283,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   }
   return (0, _jsxRuntime.jsx)("div", {
     style: props.style,
-    className: "ant-select-compact-item-div",
+    className: "pro-select",
     children: (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,

package/lib/ProSelect/index.less

@@ -9,9 +9,9 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
-.ant-select-compact-item-div {
+.pro-select {
   width: 100%;
-  >.ant-select {
+  > .ant-select {
     width: 100%;
   }
 }

package/lib/ProStep/style/index.less

@@ -8,7 +8,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;

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/lib/global.less

@@ -17,7 +17,7 @@ pre {
 
   // 轨道
   ::-webkit-scrollbar-track {
-    background-color: #fff;
+    background: transparent;
     border-radius: 10px;
   }
 
@@ -51,6 +51,6 @@ pre {
   }
 
   :hover::-webkit-scrollbar-track {
-    background-color: #fff;
+    background: transparent;
   }
 }

package/package.json

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