@zat-design/sisyphus-react 3.4.9-beta.1 → 3.4.9-beta.10

package/dist/index.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {

package/dist/less.esm.css

@@ -682,7 +682,7 @@
 .pro-collapse .pro-collapse-icon img {
   vertical-align: sub;
 }
-.pro-collapse.pro-collapse-no-title .ant-collapse-header {
+.pro-collapse.pro-collapse-no-title > .pro-collapse-panel > .ant-collapse-header {
   display: none !important;
 }
 .pro-collapse.pro-collapse-no-title .pro-collapse-level2 .ant-collapse-header {

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

@@ -89,6 +89,10 @@ var RenderField = function RenderField(_ref) {
   }
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
+    type = null;
+  }
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = getNamePath(name, virtualKey);
   var rowData = form.getFieldValue([].concat(_toConsumableArray(namePath), [index])) || record || {};

package/es/ProEnum/components/Group.d.ts

@@ -4,6 +4,7 @@ interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldLabel: string;
     disabled?: boolean;
     allowClear?: boolean;
+    button?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/es/ProEnum/index.js

@@ -12,7 +12,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useState, useEffect, useMemo } from 'react';
@@ -28,6 +28,7 @@ import useEnum from './hooks/useEnum';
 import locale from '../locale';
 import './style/index.less';
 var ProEnum = function ProEnum(props) {
+  var _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -48,7 +49,9 @@ var ProEnum = function ProEnum(props) {
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    showCodeName = _ref2.showCodeName,
     resProps = _objectWithoutProperties(_ref2, _excluded2);
+  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = '';
   var fieldValue = '';
   var _useState = useState(dataSource || []),
@@ -235,8 +238,8 @@ var ProEnum = function ProEnum(props) {
           return item[fieldValue] === (v === null || v === void 0 ? void 0 : v[fieldValue]);
         }
         return item[fieldValue] === v;
-      });
-      return enumProps.showCodeName ? "".concat(option[fieldValue], "-").concat(option[label]) : option === null || option === void 0 ? void 0 : option[label];
+      }) || {};
+      return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {
       return list.find(function (item) {

package/es/ProEnum/style/index.less

@@ -76,8 +76,8 @@
     }
 
     .pro-enum-group-item-selected {
-      color: var(--zaui-brand);
-      background: #fff;
+      background: var(--zaui-brand);
+      color: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;

package/es/ProForm/components/combination/Group/utils.js

@@ -220,7 +220,8 @@ export var transformColumns = function transformColumns(params) {
       onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
         index: outerIndex,
         namePath: namePath,
-        form: form
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {

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

@@ -703,7 +703,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           queryBean: queryBean
         } : queryBean;
         run(params);
-      }, 800),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

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

@@ -122,8 +122,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      var _start, _end;
-      start = start || moment().startOf('day');
+      var _rest$allowEmpty, _start, _end;
+      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
+        start = null;
+      } else {
+        start = start || moment().startOf('day');
+      }
       end = foreverMoment;
       onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {

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

@@ -109,9 +109,12 @@ var RenderFields = function RenderFields(props) {
     if (typeof _type === 'string') {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
+    // 自定义组件时 防止默认值影像后续判断
+    if ('component' in column) {
+      _type = null;
+    }
     if (component && /*#__PURE__*/React.isValidElement(component)) {
       var _newComponent$props;
-      _type = null;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -11,9 +11,12 @@
   }
 
   &.pro-collapse-no-title {
-    .@{ant-prefix}-collapse-header {
-      display: none !important;
+    &>.pro-collapse-panel{
+      &>.@{ant-prefix}-collapse-header {
+        display: none !important;
+      }
     }
+   
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
         display: flex !important;

package/es/ProSelect/index.js

@@ -23,10 +23,11 @@ import { getSelectList } from './utils';
 import './index.less';
 var Option = _Select.Option;
 export var ProSelect = function ProSelect(props, ref) {
-  var _locale$ProSelect;
+  var _selectProps$showCode, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
-    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -54,6 +55,7 @@ export var ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
+  selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
@@ -269,14 +271,13 @@ export var ProSelect = function ProSelect(props, ref) {
     return value;
   };
   var newSelectList = selectList;
-  console.log('otherProps', otherProps, filterInList);
-  debugger;
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,
       value: props.value,
       dataSource: selectList,
-      labelInValue: labelInValue
+      labelInValue: labelInValue,
+      fieldNames: fieldNames
     });
   }
   return _jsx(_Select, _objectSpread(_objectSpread({

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

@@ -1,9 +1,10 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
     otherProps: any;
     value: any;
     dataSource: any;
     labelInValue: any;
+    fieldNames: any;
 }) => any;

package/es/ProSelect/utils/index.js

@@ -6,7 +6,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
-    labelInValue = _ref.labelInValue;
+    labelInValue = _ref.labelInValue,
+    fieldNames = _ref.fieldNames;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -29,7 +30,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
   });
   var diffList = _.difference(selectValues, [value]);
   return dataSource.filter(function (item) {
-    return !diffList.includes(labelInValue ? item : item.value);
+    return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
 };
 /**
@@ -39,7 +40,8 @@ export var getSelectList = function getSelectList(_ref2) {
   var otherProps = _ref2.otherProps,
     value = _ref2.value,
     dataSource = _ref2.dataSource,
-    labelInValue = _ref2.labelInValue;
+    labelInValue = _ref2.labelInValue,
+    fieldNames = _ref2.fieldNames;
   if (!otherProps) {
     return null;
   }
@@ -55,6 +57,7 @@ export var getSelectList = function getSelectList(_ref2) {
     selectName: selectName,
     value: value,
     dataSource: dataSource,
-    labelInValue: labelInValue
+    labelInValue: labelInValue,
+    fieldNames: fieldNames
   });
 };

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

@@ -92,6 +92,10 @@ var RenderField = function RenderField(_ref) {
   }
   // type类型 首字母转大写
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
+  // 自定义组件时 防止默认值影像后续判断
+  if ('component' in column) {
+    type = null;
+  }
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
   var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};

package/lib/ProEnum/components/Group.d.ts

@@ -4,6 +4,7 @@ interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldLabel: string;
     disabled?: boolean;
     allowClear?: boolean;
+    button?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/index.js

@@ -27,8 +27,9 @@ var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
-  _excluded2 = ["fieldNames", "clear", "cacheKey"];
+  _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = function ProEnum(props) {
+  var _enumProps$showCodeNa;
   var code = props.code,
     _props$type = props.type,
     type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -49,7 +50,9 @@ var ProEnum = function ProEnum(props) {
     clear = _ref2$clear === void 0 ? true : _ref2$clear,
     _ref2$cacheKey = _ref2.cacheKey,
     cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    showCodeName = _ref2.showCodeName,
     resProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
   var label = '';
   var fieldValue = '';
   var _useState = (0, _react.useState)(dataSource || []),
@@ -236,8 +239,8 @@ var ProEnum = function ProEnum(props) {
           return item[fieldValue] === (v === null || v === void 0 ? void 0 : v[fieldValue]);
         }
         return item[fieldValue] === v;
-      });
-      return enumProps.showCodeName ? "".concat(option[fieldValue], "-").concat(option[label]) : option === null || option === void 0 ? void 0 : option[label];
+      }) || {};
+      return enumProps.showCodeName ? "".concat(option === null || option === void 0 ? void 0 : option[fieldValue], "-").concat(option === null || option === void 0 ? void 0 : option[label]) : option === null || option === void 0 ? void 0 : option[label];
     });
     var record = value.map(function (v) {
       return list.find(function (item) {

package/lib/ProEnum/style/index.less

@@ -76,8 +76,8 @@
     }
 
     .pro-enum-group-item-selected {
-      color: var(--zaui-brand);
-      background: #fff;
+      background: var(--zaui-brand);
+      color: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;

package/lib/ProForm/components/combination/Group/utils.js

@@ -227,7 +227,8 @@ var transformColumns = exports.transformColumns = function transformColumns(para
       onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
         index: outerIndex,
         namePath: namePath,
-        form: form
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
     return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {

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

@@ -700,7 +700,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           queryBean: queryBean
         } : queryBean;
         run(params);
-      }, 800),
+      }, 2000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }

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

@@ -124,8 +124,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      var _start, _end;
-      start = start || (0, _moment.default)().startOf('day');
+      var _rest$allowEmpty, _start, _end;
+      if (((_rest$allowEmpty = rest.allowEmpty) === null || _rest$allowEmpty === void 0 ? void 0 : _rest$allowEmpty[0]) === true) {
+        start = null;
+      } else {
+        start = start || (0, _moment.default)().startOf('day');
+      }
       end = foreverMoment;
       onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {

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

@@ -117,9 +117,12 @@ var RenderFields = function RenderFields(props) {
     if (typeof _type === 'string') {
       TargetComponent = _isView && viewRender ? viewRenderHandle : componentMap[_type];
     }
+    // 自定义组件时 防止默认值影像后续判断
+    if ('component' in column) {
+      _type = null;
+    }
     if (component && /*#__PURE__*/_react.default.isValidElement(component)) {
       var _newComponent$props;
-      _type = null;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -11,9 +11,12 @@
   }
 
   &.pro-collapse-no-title {
-    .@{ant-prefix}-collapse-header {
-      display: none !important;
+    &>.pro-collapse-panel{
+      &>.@{ant-prefix}-collapse-header {
+        display: none !important;
+      }
     }
+   
     .pro-collapse-level2{
       .@{ant-prefix}-collapse-header {
         display: flex !important;

package/lib/ProSelect/index.js

@@ -24,10 +24,11 @@ require("./index.less");
 var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
-  var _locale$ProSelect;
+  var _selectProps$showCode, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
-    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames;
+    proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
+    showCodeName = _ref.showCodeName;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -55,6 +56,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
@@ -270,14 +272,13 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     return value;
   };
   var newSelectList = selectList;
-  console.log('otherProps', otherProps, filterInList);
-  debugger;
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = (0, _utils.getSelectList)({
       otherProps: otherProps,
       value: props.value,
       dataSource: selectList,
-      labelInValue: labelInValue
+      labelInValue: labelInValue,
+      fieldNames: fieldNames
     });
   }
   return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({

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

@@ -1,9 +1,10 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, }: {
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
     otherProps: any;
     value: any;
     dataSource: any;
     labelInValue: any;
+    fieldNames: any;
 }) => any;

package/lib/ProSelect/utils/index.js

@@ -14,7 +14,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
-    labelInValue = _ref.labelInValue;
+    labelInValue = _ref.labelInValue,
+    fieldNames = _ref.fieldNames;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -37,7 +38,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
   });
   var diffList = _lodash.default.difference(selectValues, [value]);
   return dataSource.filter(function (item) {
-    return !diffList.includes(labelInValue ? item : item.value);
+    return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
 };
 /**
@@ -47,7 +48,8 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
   var otherProps = _ref2.otherProps,
     value = _ref2.value,
     dataSource = _ref2.dataSource,
-    labelInValue = _ref2.labelInValue;
+    labelInValue = _ref2.labelInValue,
+    fieldNames = _ref2.fieldNames;
   if (!otherProps) {
     return null;
   }
@@ -63,6 +65,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     selectName: selectName,
     value: value,
     dataSource: dataSource,
-    labelInValue: labelInValue
+    labelInValue: labelInValue,
+    fieldNames: fieldNames
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.9-beta.1",
+  "version": "3.4.9-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,7 +58,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.20",
+    "@zat-design/utils": "^1.1.22",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",