@zat-design/sisyphus-react 3.6.6-beta.3 → 3.6.6-beta.5

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

@@ -591,7 +591,7 @@ var RenderField = function RenderField(_ref) {
   }) : null;
   return _jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       placement: "topLeft",
       open: changed ? undefined : false,

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

@@ -221,7 +221,9 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = useMemo(function () {
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {

package/es/ProSelect/index.js

@@ -338,7 +338,7 @@ export var ProSelect = function ProSelect(props, ref) {
               title: OptionRender(item),
               children: OptionRender(item)
             }) : _jsx("span", {
-              title: "".concat(item[code], "-").concat(item[label]),
+              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/es/ProTable/propsType.d.ts

@@ -72,11 +72,12 @@ export interface PaginationProps {
     pageNum: number;
     pageSize: number;
 }
+type RowSelectionTypeWithPick = Pick<TableProps<any>, 'rowSelection'>['rowSelection'];
 export interface RequestOptions<T, R> {
     form?: FormInstance;
     isResetQuery?: boolean;
     rowKey?: string | GetRowKey<R>;
-    rowSelection?: boolean;
+    rowSelection?: boolean | RowSelectionTypeWithPick;
     rowSelectType?: RowSelectionType;
     rowSelections?: boolean;
     extraParams?: Partial<T>;

package/es/ProTable/useAntdTable.d.ts

@@ -11,7 +11,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         selectedRowKeys: Key[];
         onChange(rowKeys: Key[], rows: any[]): void;
         onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: () => {
+        getCheckboxProps: (record?: any) => {
             className: string;
         };
         selections: boolean | ({
@@ -57,7 +57,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
             selectedRowKeys: Key[];
             onChange(rowKeys: Key[], rows: any[]): void;
             onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: () => {
+            getCheckboxProps: (record?: any) => {
                 className: string;
             };
             selections: boolean | ({

package/es/ProTable/useAntdTable.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
-import { pickBy } from 'lodash';
+import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from './index';
 import { isListResult } from './utils';
 import locale, { formatMessage } from '../locale';
@@ -313,7 +313,7 @@ function useAntdTable(service, options, useRequestOptions) {
       }));
     }
   }, [extraParams]);
-  var rowSelection = {
+  var _rowSelection = {
     fixed: true,
     type: rowSelectType,
     columnWidth: rowSelections ? 64 : undefined,
@@ -355,7 +355,7 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    getCheckboxProps: function getCheckboxProps() {
+    getCheckboxProps: function getCheckboxProps(record) {
       return {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
@@ -424,6 +424,20 @@ function useAntdTable(service, options, useRequestOptions) {
       }()
     }] : false
   };
+  var rowSelection = isObject(returnRowSelection) ? merge(_rowSelection, returnRowSelection) : _rowSelection;
+  if (isObject(returnRowSelection) && !isEqual(rowSelection, _rowSelection)) {
+    // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
+    var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
+    if (isHasGetCheckboxProps) {
+      set(rowSelection, 'getCheckboxProps', function (record) {
+        var _rowSelection$getChec;
+        var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
+        return _objectSpread({
+          className: allSelected && rowSelections ? 'checkbox-disabled' : ''
+        }, passReturnObjects);
+      });
+    }
+  }
   var selectedTip = allSelected || selectedRowKeys.length ? formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProTable5 = locale.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
     selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;

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

@@ -594,7 +594,7 @@ var RenderField = function RenderField(_ref) {
   }) : null;
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       placement: "topLeft",
       open: changed ? undefined : false,

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

@@ -221,7 +221,9 @@ var ProCascader = function ProCascader(props) {
     // 如果没有在当前层级的选项中找到匹配的 value，返回 null
     return null;
   };
-  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var _selectedOptions = (0, _react.useMemo)(function () {
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {

package/lib/ProSelect/index.js

@@ -341,7 +341,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
               title: OptionRender(item),
               children: OptionRender(item)
             }) : (0, _jsxRuntime.jsx)("span", {
-              title: "".concat(item[code], "-").concat(item[label]),
+              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

package/lib/ProTable/propsType.d.ts

@@ -72,11 +72,12 @@ export interface PaginationProps {
     pageNum: number;
     pageSize: number;
 }
+type RowSelectionTypeWithPick = Pick<TableProps<any>, 'rowSelection'>['rowSelection'];
 export interface RequestOptions<T, R> {
     form?: FormInstance;
     isResetQuery?: boolean;
     rowKey?: string | GetRowKey<R>;
-    rowSelection?: boolean;
+    rowSelection?: boolean | RowSelectionTypeWithPick;
     rowSelectType?: RowSelectionType;
     rowSelections?: boolean;
     extraParams?: Partial<T>;

package/lib/ProTable/useAntdTable.d.ts

@@ -11,7 +11,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
         selectedRowKeys: Key[];
         onChange(rowKeys: Key[], rows: any[]): void;
         onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: () => {
+        getCheckboxProps: (record?: any) => {
             className: string;
         };
         selections: boolean | ({
@@ -57,7 +57,7 @@ declare function useAntdTable<I, R extends Record<string, any>, S extends Servic
             selectedRowKeys: Key[];
             onChange(rowKeys: Key[], rows: any[]): void;
             onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: () => {
+            getCheckboxProps: (record?: any) => {
                 className: string;
             };
             selections: boolean | ({

package/lib/ProTable/useAntdTable.js

@@ -320,7 +320,7 @@ function useAntdTable(service, options, useRequestOptions) {
       }));
     }
   }, [extraParams]);
-  var rowSelection = {
+  var _rowSelection = {
     fixed: true,
     type: rowSelectType,
     columnWidth: rowSelections ? 64 : undefined,
@@ -362,7 +362,7 @@ function useAntdTable(service, options, useRequestOptions) {
         });
       }
     },
-    getCheckboxProps: function getCheckboxProps() {
+    getCheckboxProps: function getCheckboxProps(record) {
       return {
         className: allSelected && rowSelections ? 'checkbox-disabled' : ''
       };
@@ -431,6 +431,20 @@ function useAntdTable(service, options, useRequestOptions) {
       }()
     }] : false
   };
+  var rowSelection = (0, _lodash.isObject)(returnRowSelection) ? (0, _lodash.merge)(_rowSelection, returnRowSelection) : _rowSelection;
+  if ((0, _lodash.isObject)(returnRowSelection) && !(0, _lodash.isEqual)(rowSelection, _rowSelection)) {
+    // getCheckboxProps需要特殊兼容原有的逻辑，特殊处理
+    var isHasGetCheckboxProps = Reflect.ownKeys(returnRowSelection).includes('getCheckboxProps');
+    if (isHasGetCheckboxProps) {
+      (0, _lodash.set)(rowSelection, 'getCheckboxProps', function (record) {
+        var _rowSelection$getChec;
+        var passReturnObjects = (_rowSelection$getChec = rowSelection.getCheckboxProps(record)) !== null && _rowSelection$getChec !== void 0 ? _rowSelection$getChec : {};
+        return (0, _objectSpread2.default)({
+          className: allSelected && rowSelections ? 'checkbox-disabled' : ''
+        }, passReturnObjects);
+      });
+    }
+  }
   var selectedTip = allSelected || selectedRowKeys.length ? (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable5 = _locale.default.ProTable) === null || _locale$ProTable5 === void 0 ? void 0 : _locale$ProTable5.selectAll, {
     selectedNum: allSelected ? total : selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length
   }) : null;

package/package.json

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