@zat-design/sisyphus-react 3.5.3-beta.1 → 3.5.3-beta.3

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

@@ -530,7 +530,7 @@ var RenderField = function RenderField(_ref) {
   }
   Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), valueTypeTransform()), namesTransform()), isTrim(type, trim, useProConfig())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (!isEditing) {
+  if (isView) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));

package/es/ProTable/propsType.d.ts

@@ -85,6 +85,7 @@ export interface RequestOptions<T, R> {
     onPageChange?: (page: PaginationProps) => void;
     transformParams?: (params: any, requestParams: any) => any;
     transformResponse?: (res: any) => ListResponse<R>;
+    disabled?: (record: any) => boolean;
 }
 export interface Params<T = any> extends PaginationProps {
     queryBean?: Partial<T>;

package/es/ProTable/useAntdTable.js

@@ -60,7 +60,8 @@ function useAntdTable(service, options, useRequestOptions) {
     crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse;
+    transformResponse = _useDefaultOptions.transformResponse,
+    disabled = _useDefaultOptions.disabled;
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams,
     manual = _ref.manual;
@@ -136,12 +137,29 @@ function useAntdTable(service, options, useRequestOptions) {
       var filterList = data.filter(function (item) {
         return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
       });
-      setState({
+      var nextObject = {
         selectedRecords: [].concat(_toConsumableArray(selectedRecords), _toConsumableArray(filterList)),
         selectedRowKeys: [].concat(_toConsumableArray(selectedRowKeys), _toConsumableArray(filterList === null || filterList === void 0 ? void 0 : filterList.map(function (item) {
           return item === null || item === void 0 ? void 0 : item[rowKey];
         })))
-      });
+      };
+      if (typeof disabled === 'function') {
+        var _selectedRecords$filt, _nextSelectRecords$ma;
+        var _nextObject = nextObject,
+          _selectedRecords = _nextObject.selectedRecords;
+        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(function (item) {
+          // 去掉禁用的
+          return !disabled(item);
+        })) !== null && _selectedRecords$filt !== void 0 ? _selectedRecords$filt : [];
+        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(function (item) {
+          return item === null || item === void 0 ? void 0 : item[rowKey];
+        })) !== null && _nextSelectRecords$ma !== void 0 ? _nextSelectRecords$ma : [];
+        nextObject = {
+          selectedRecords: nextSelectRecords,
+          selectedRowKeys: nextSelectedRowKeys
+        };
+      }
+      setState(nextObject);
     }
   }, [allSelected, data]);
   // 分页变更
@@ -282,6 +300,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   }, [curService]);
   useDeepCompareEffect(function () {
+    // extraParams改变时重新请求
     if (!manual && extraParams) {
       var newPage = {
         pageNum: 1,

package/es/ProTreeModal/components/Trigger.js

@@ -32,10 +32,15 @@ function Trigger(props) {
   var _ref = appointProps || {},
     appointDisabled = _ref.disabled;
   var _tempAppointDisabled = appointDisabled || false;
-  var _ref2 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
+  var _tempDisabled = disabled || false;
+  var _ref2 = Array.isArray(disabled) ? disabled : [_tempDisabled, _tempDisabled],
     _ref3 = _slicedToArray(_ref2, 2),
-    allDisabled = _ref3[0],
-    specifyDisabled = _ref3[1];
+    beforeDisabled = _ref3[0],
+    afterDisabled = _ref3[1];
+  var _ref4 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
+    _ref5 = _slicedToArray(_ref4, 2),
+    allDisabled = _ref5[0],
+    specifyDisabled = _ref5[1];
   var _useSetState = useSetState({
       mode: 'appoint'
     }),
@@ -94,18 +99,18 @@ function Trigger(props) {
           style: {
             width: 'auto'
           },
-          disabled: disabled,
+          disabled: beforeDisabled,
           className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
           children: [_jsx(_Select.Option, {
             value: "all",
-            disabled: disabled || allDisabled,
+            disabled: allDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[0]
           }), _jsx(_Select.Option, {
             value: "appoint",
-            disabled: disabled || specifyDisabled,
+            disabled: specifyDisabled,
             children: locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
@@ -115,7 +120,7 @@ function Trigger(props) {
   };
   return _jsx(TriggerComponent, {
     children: _jsx(_Input, {
-      className: classNames(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
+      className: classNames(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
         all: label
@@ -124,7 +129,7 @@ function Trigger(props) {
       }),
       addonAfter: state.mode === 'all' ? null : _jsxs("div", {
         className: "pro-enum-input-addonAfter",
-        children: [checkedValues.length > 0 && !disabled && _jsx("span", {
+        children: [checkedValues.length > 0 && !afterDisabled && _jsx("span", {
           className: "close-icon",
           children: _jsx(CloseOutlined, {
             onClick: handleClearAll
@@ -136,7 +141,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: disabled || state.mode === 'all',
+      disabled: afterDisabled || state.mode === 'all',
       style: _objectSpread({}, triggerStyle)
     })
   });

package/es/ProTreeModal/index.js

@@ -11,6 +11,14 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-06-04 10:01:18
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-06-04 10:30:30
+ * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import React, { useEffect, useMemo, useRef } from 'react';
 import { useDeepCompareEffect, useSetState, useRequest as useRequestFunc } from 'ahooks';
 import { cloneDeep, isFunction } from 'lodash';

package/es/ProTreeModal/propsType.d.ts

@@ -61,7 +61,7 @@ export interface ProTreeModalProps {
     /** 当为列表时可开启右侧拖动 */
     draggable?: boolean;
     /** 禁用 */
-    disabled?: boolean;
+    disabled?: any;
     /** 弹框的 title */
     title?: string | ReactNode;
     /** 全选的标识给后端 */

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

@@ -533,7 +533,7 @@ var RenderField = function RenderField(_ref) {
   }
   Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), valueTypeTransform()), namesTransform()), (0, _utils.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())));
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (!isEditing) {
+  if (isView) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));

package/lib/ProTable/propsType.d.ts

@@ -85,6 +85,7 @@ export interface RequestOptions<T, R> {
     onPageChange?: (page: PaginationProps) => void;
     transformParams?: (params: any, requestParams: any) => any;
     transformResponse?: (res: any) => ListResponse<R>;
+    disabled?: (record: any) => boolean;
 }
 export interface Params<T = any> extends PaginationProps {
     queryBean?: Partial<T>;

package/lib/ProTable/useAntdTable.js

@@ -67,7 +67,8 @@ function useAntdTable(service, options, useRequestOptions) {
     crossPageSelect = _useDefaultOptions$cr === void 0 ? false : _useDefaultOptions$cr,
     onPageChange = _useDefaultOptions.onPageChange,
     transformParams = _useDefaultOptions.transformParams,
-    transformResponse = _useDefaultOptions.transformResponse;
+    transformResponse = _useDefaultOptions.transformResponse,
+    disabled = _useDefaultOptions.disabled;
   var _ref = useRequestOptions || {},
     defaultParams = _ref.defaultParams,
     manual = _ref.manual;
@@ -143,12 +144,29 @@ function useAntdTable(service, options, useRequestOptions) {
       var filterList = data.filter(function (item) {
         return !selectedRowKeys.includes(item === null || item === void 0 ? void 0 : item[rowKey]);
       });
-      setState({
+      var nextObject = {
         selectedRecords: [].concat((0, _toConsumableArray2.default)(selectedRecords), (0, _toConsumableArray2.default)(filterList)),
         selectedRowKeys: [].concat((0, _toConsumableArray2.default)(selectedRowKeys), (0, _toConsumableArray2.default)(filterList === null || filterList === void 0 ? void 0 : filterList.map(function (item) {
           return item === null || item === void 0 ? void 0 : item[rowKey];
         })))
-      });
+      };
+      if (typeof disabled === 'function') {
+        var _selectedRecords$filt, _nextSelectRecords$ma;
+        var _nextObject = nextObject,
+          _selectedRecords = _nextObject.selectedRecords;
+        var nextSelectRecords = (_selectedRecords$filt = _selectedRecords.filter(function (item) {
+          // 去掉禁用的
+          return !disabled(item);
+        })) !== null && _selectedRecords$filt !== void 0 ? _selectedRecords$filt : [];
+        var nextSelectedRowKeys = (_nextSelectRecords$ma = nextSelectRecords.map(function (item) {
+          return item === null || item === void 0 ? void 0 : item[rowKey];
+        })) !== null && _nextSelectRecords$ma !== void 0 ? _nextSelectRecords$ma : [];
+        nextObject = {
+          selectedRecords: nextSelectRecords,
+          selectedRowKeys: nextSelectedRowKeys
+        };
+      }
+      setState(nextObject);
     }
   }, [allSelected, data]);
   // 分页变更
@@ -289,6 +307,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   }, [curService]);
   (0, _ahooks.useDeepCompareEffect)(function () {
+    // extraParams改变时重新请求
     if (!manual && extraParams) {
       var newPage = {
         pageNum: 1,

package/lib/ProTreeModal/components/Trigger.js

@@ -35,10 +35,15 @@ function Trigger(props) {
   var _ref = appointProps || {},
     appointDisabled = _ref.disabled;
   var _tempAppointDisabled = appointDisabled || false;
-  var _ref2 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
+  var _tempDisabled = disabled || false;
+  var _ref2 = Array.isArray(disabled) ? disabled : [_tempDisabled, _tempDisabled],
     _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-    allDisabled = _ref3[0],
-    specifyDisabled = _ref3[1];
+    beforeDisabled = _ref3[0],
+    afterDisabled = _ref3[1];
+  var _ref4 = Array.isArray(appointDisabled) ? appointDisabled : [_tempAppointDisabled, _tempAppointDisabled],
+    _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
+    allDisabled = _ref5[0],
+    specifyDisabled = _ref5[1];
   var _useSetState = (0, _ahooks.useSetState)({
       mode: 'appoint'
     }),
@@ -97,18 +102,18 @@ function Trigger(props) {
           style: {
             width: 'auto'
           },
-          disabled: disabled,
+          disabled: beforeDisabled,
           className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
           children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "all",
-            disabled: disabled || allDisabled,
+            disabled: allDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[0]
           }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
             value: "appoint",
-            disabled: disabled || specifyDisabled,
+            disabled: specifyDisabled,
             children: _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.specifyMode[1]
           })]
         }), props.children]
@@ -118,7 +123,7 @@ function Trigger(props) {
   };
   return (0, _jsxRuntime.jsx)(TriggerComponent, {
     children: (0, _jsxRuntime.jsx)(_antd.Input, {
-      className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
+      className: (0, _classnames.default)(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : state.mode === 'all' ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll1, {
         all: label
@@ -127,7 +132,7 @@ function Trigger(props) {
       }),
       addonAfter: state.mode === 'all' ? null : (0, _jsxRuntime.jsxs)("div", {
         className: "pro-enum-input-addonAfter",
-        children: [checkedValues.length > 0 && !disabled && (0, _jsxRuntime.jsx)("span", {
+        children: [checkedValues.length > 0 && !afterDisabled && (0, _jsxRuntime.jsx)("span", {
           className: "close-icon",
           children: (0, _jsxRuntime.jsx)(_icons.CloseOutlined, {
             onClick: handleClearAll
@@ -139,7 +144,7 @@ function Trigger(props) {
         })]
       }),
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal3 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: disabled || state.mode === 'all',
+      disabled: afterDisabled || state.mode === 'all',
       style: (0, _objectSpread2.default)({}, triggerStyle)
     })
   });

package/lib/ProTreeModal/index.js

@@ -23,6 +23,15 @@ var _utils = require("./utils");
 var _inputSearch = _interopRequireDefault(require("../assets/input-search.svg"));
 var _locale = _interopRequireWildcard(require("../locale"));
 require("./style/index.less");
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-06-04 10:01:18
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-06-04 10:30:30
+ * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
 var LIST = 'LIST';
 var TREE = 'TREE';
 var CASCADER = exports.CASCADER = 'CASCADER';

package/lib/ProTreeModal/propsType.d.ts

@@ -61,7 +61,7 @@ export interface ProTreeModalProps {
     /** 当为列表时可开启右侧拖动 */
     draggable?: boolean;
     /** 禁用 */
-    disabled?: boolean;
+    disabled?: any;
     /** 弹框的 title */
     title?: string | ReactNode;
     /** 全选的标识给后端 */

package/package.json

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