@zat-design/sisyphus-react 4.4.1-beta.4 → 4.4.3-beta.2

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

@@ -0,0 +1,34 @@
+/// <reference types="react" />
+/** 列级响应式配置（可能为静态值或 ReactiveFunction） */
+export interface ReactiveProps {
+    show?: any;
+    disabled?: any;
+    required?: any;
+    rules?: any;
+    fieldProps?: any;
+    desensitization?: any;
+}
+/** 解析后的列级响应式值 */
+export interface ReactiveValues {
+    show: any;
+    disabled: any;
+    required: any;
+    rules: any;
+    fieldProps: any;
+    desensitization: any;
+}
+/** 持有解析值的 ref 集合 */
+export interface ReactiveRefs {
+    showRef: React.MutableRefObject<any>;
+    disabledRef: React.MutableRefObject<any>;
+    requiredRef: React.MutableRefObject<any>;
+    rulesRef: React.MutableRefObject<any>;
+    fieldPropsRef: React.MutableRefObject<any>;
+    desensitizationRef: React.MutableRefObject<any>;
+}
+/** 按当前表单值解析 show/disabled/required/rules/fieldProps/desensitization（纯函数，无副作用） */
+export declare const resolveReactiveValues: (reactiveProps: ReactiveProps, currentValues: any, ctx: any) => ReactiveValues;
+/** 比较解析值与上一次 ref 值是否有变化（纯函数，无副作用） */
+export declare const hasReactiveDiff: (refs: ReactiveRefs, next: ReactiveValues) => boolean;
+/** 将解析值写回 ref 集合 */
+export declare const commitReactiveValues: (refs: ReactiveRefs, next: ReactiveValues) => void;

package/es/ProForm/utils/reactiveValues.js

@@ -0,0 +1,45 @@
+import _isEqualWith from "lodash/isEqualWith";
+import _isFunction from "lodash/isFunction";
+import { customEqualForFunction } from "../../utils";
+
+/** 列级响应式配置（可能为静态值或 ReactiveFunction） */
+
+/** 解析后的列级响应式值 */
+
+/** 持有解析值的 ref 集合 */
+
+/** 按当前表单值解析 show/disabled/required/rules/fieldProps/desensitization（纯函数，无副作用） */
+export const resolveReactiveValues = (reactiveProps, currentValues, ctx) => {
+  const {
+    show,
+    disabled,
+    required,
+    rules,
+    fieldProps,
+    desensitization
+  } = reactiveProps;
+  return {
+    show: _isFunction(show) ? Boolean(show(currentValues, ctx)) : show,
+    disabled: _isFunction(disabled) ? disabled(currentValues, ctx) : disabled,
+    required: _isFunction(required) ? required(currentValues, ctx) : required,
+    rules: _isFunction(rules) ? rules(currentValues, ctx) : rules,
+    fieldProps: _isFunction(fieldProps) ? fieldProps(currentValues, ctx) : fieldProps,
+    desensitization: _isFunction(desensitization) ? desensitization(currentValues, ctx) : desensitization
+  };
+};
+
+/** 比较解析值与上一次 ref 值是否有变化（纯函数，无副作用） */
+export const hasReactiveDiff = (refs, next) => {
+  return next.show !== refs.showRef.current || !_isEqualWith(refs.disabledRef.current, next.disabled, customEqualForFunction) || next.required !== refs.requiredRef.current || !_isEqualWith(refs.rulesRef.current, next.rules, customEqualForFunction) || !_isEqualWith(refs.fieldPropsRef.current, next.fieldProps, customEqualForFunction) || !_isEqualWith(refs.desensitizationRef.current, next.desensitization) || Boolean(next.fieldProps?.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
+  ;
+};
+
+/** 将解析值写回 ref 集合 */
+export const commitReactiveValues = (refs, next) => {
+  refs.showRef.current = next.show;
+  refs.disabledRef.current = next.disabled;
+  refs.requiredRef.current = next.required;
+  refs.rulesRef.current = next.rules;
+  refs.fieldPropsRef.current = next.fieldProps;
+  refs.desensitizationRef.current = next.desensitization;
+};

package/es/ProSelect/index.js

@@ -254,6 +254,7 @@ export const ProSelect = (props, ref) => {
     const defaultConfig = {
       enabled: true,
       filterOption: _isFunction(_onSearch) ? false : defaultFilterOption,
+      optionFilterProp: 'label',
       onSearch: searchValue => {
         _onSearch?.(searchValue, {
           ...fetchFunctionRef.current
@@ -276,6 +277,7 @@ export const ProSelect = (props, ref) => {
         ...customShowSearch,
         enabled: true,
         filterOption: customShowSearch.filterOption ?? defaultConfig.filterOption,
+        optionFilterProp: customShowSearch.optionFilterProp ?? defaultConfig.optionFilterProp,
         onSearch: customShowSearch.onSearch ?? defaultConfig.onSearch
       };
     }
@@ -466,10 +468,6 @@ export const ProSelect = (props, ref) => {
     }
     return buildOptionItem(item, index);
   }) : [];
-  const selectSearchProps = {
-    filterOption: mergedShowSearch.filterOption,
-    onSearch: mergedShowSearch.onSearch
-  };
   return /*#__PURE__*/_jsx("div", {
     style: props.style,
     className: "pro-select",
@@ -478,14 +476,17 @@ export const ProSelect = (props, ref) => {
       allowClear: true,
       loading: fetchFunction?.loading,
       onChange: handleChange,
-      showSearch: mergedShowSearch.enabled,
-      ...selectSearchProps,
+      showSearch: mergedShowSearch.enabled ? {
+        filterOption: mergedShowSearch.filterOption,
+        optionFilterProp: mergedShowSearch.optionFilterProp,
+        onSearch: mergedShowSearch.onSearch
+      } : false,
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       },
       ..._omit({
         ...selectProps
-      }, ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch']),
+      }, ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch', 'filterOption', 'optionFilterProp', 'searchValue']),
       // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
       maxTagPlaceholder: selectProps.mode === 'multiple' && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
       optionRender: selectOptionRender,

package/es/ProTreeModal/components/Trigger.js

@@ -59,15 +59,16 @@ function Trigger(props) {
     'trigger-no-hover': afterDisabled
   });
   if (isView) {
+    const hasValue = checkedValues.length > 0;
     return /*#__PURE__*/_jsxs("div", {
       className: "pro-tree-modal-isView",
       children: [/*#__PURE__*/_jsx("div", {
-        children: checkedValues.length === 0 ? '-' : state.mode === 'all' ? formatMessage(locale?.ProTreeModal.checkAll1, {
+        children: !hasValue ? '-' : state.mode === 'all' ? formatMessage(locale?.ProTreeModal.checkAll1, {
           all: label
         }) : formatMessage(locale?.ProTreeModal?.checkNumber, {
           num: checkedValues.length
         })
-      }), /*#__PURE__*/_jsx("div", {
+      }), hasValue && /*#__PURE__*/_jsx("div", {
         className: addonAfterClassName,
         children: /*#__PURE__*/_jsx(ReactSVG, {
           className: viewIconClassName,
@@ -94,7 +95,7 @@ function Trigger(props) {
         style: {
           ...triggerStyle
         },
-        children: [/*#__PURE__*/_jsxs(Select, {
+        children: [/*#__PURE__*/_jsx(Select, {
           style: {
             width: 'auto'
           },
@@ -103,15 +104,15 @@ function Trigger(props) {
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,
-          children: [/*#__PURE__*/_jsx(Select.Option, {
-            value: "all",
-            disabled: allDisabled,
-            children: locale?.ProTreeModal.specifyMode[0]
-          }), /*#__PURE__*/_jsx(Select.Option, {
-            value: "appoint",
-            disabled: specifyDisabled,
-            children: locale?.ProTreeModal.specifyMode[1]
-          })]
+          options: [{
+            value: 'all',
+            label: locale?.ProTreeModal.specifyMode[0],
+            disabled: !!allDisabled
+          }, {
+            value: 'appoint',
+            label: locale?.ProTreeModal.specifyMode[1],
+            disabled: !!specifyDisabled
+          }]
         }), props.children]
       });
     }

package/es/ProTreeModal/style/index.less

@@ -67,7 +67,8 @@
   }
 
   .@{ant-prefix}-input-disabled {
-    border-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
   }
 
   .@{ant-prefix}-input-group-wrapper:hover {
@@ -266,6 +267,16 @@
     .pro-tree-modal-view-svg {
       margin-left: var(--zaui-space-size-sm, 8px);
     }
+
+    .pro-enum-input-addonAfter {
+      padding: 0;
+      background: transparent;
+      border: none;
+
+      &:hover {
+        box-shadow: none !important;
+      }
+    }
   }
 
   &-tree-content {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.4.1-beta.4",
+  "version": "4.4.3-beta.2",
   "license": "MIT",
   "files": [
     "es",

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

@@ -1,22 +0,0 @@
-import { FormInstance } from 'antd';
-import { NamePath } from 'antd/es/form/interface';
-import type { ValuedNotifyInfo } from '@rc-component/form/es/interface';
-export type ModifiedFormInstanceType<T> = FormInstance<T> & {
-    isModified?: boolean;
-    /** 默认清空设置值的报错状态 */
-    setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
-    formKey?: string;
-    _init?: boolean;
-    __INTERNAL_CONFIG__?: {
-        fields?: any[];
-        stopOnFirstError?: boolean;
-        [key: string]: any;
-    };
-};
-export interface FormInstanceOption {
-    scrollToError?: boolean;
-    optimize?: boolean;
-    formKey?: string;
-    source?: string;
-}
-export declare const useForm: <T>(originForm?: ModifiedFormInstanceType<T> | FormInstanceOption, options?: FormInstanceOption) => [ModifiedFormInstanceType<T>];