Merge pull request #11306 from allenve/330-6.10.0

fix: 人员组件移动端支持禁用
baidu · Dec 2, 2024 · 1fcc720 · 1fcc720
2 parents 45b476b + d5b7c77
commit 1fcc720
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/packages/amis-ui/src/components/UserSelect.tsx b/packages/amis-ui/src/components/UserSelect.tsx
@@ -45,6 +45,7 @@ export interface UserSelectProps
   controlled?: boolean;
   displayFields: Array<string>;
   isTab?: boolean;
+  disabled?: boolean;
   fetcher?: (
     api: Api,
     data?: any,
@@ -995,6 +996,7 @@ export class UserSelect extends React.Component<
       showResultBox,
       labelField = 'label',
       valueField = 'value',
+      disabled,
       mobileUI
     } = this.props;
 
@@ -1007,6 +1009,7 @@ export class UserSelect extends React.Component<
             className={cx('UserSelect-input', isOpened ? 'is-active' : '')}
             allowInput={false}
             result={this.getResult()}
+            disabled={disabled}
             itemRender={(option: any) => {
               if (labelField !== 'avatar') {
                 return (

diff --git a/packages/amis-ui/src/components/UserTabSelect.tsx b/packages/amis-ui/src/components/UserTabSelect.tsx
@@ -35,6 +35,7 @@ export interface UserTabSelectProps extends ThemeProps, LocaleProps {
   selection?: Array<Option>;
   displayFields: string[];
   data?: PlainObject;
+  disabled?: boolean;
   onChange: (value: Array<Option> | Option) => void;
   onSearch?: (
     term: string,
@@ -212,6 +213,7 @@ export class UserTabSelect extends React.Component<
       onSearch,
       deferLoad,
       data,
+      disabled,
       displayFields,
       mobileUI
     } = this.props;
@@ -227,6 +229,7 @@ export class UserTabSelect extends React.Component<
           onResultClick={this.onOpen}
           placeholder={placeholder}
           mobileUI={mobileUI}
+          disabled={disabled}
         />
         <PopUp
           isShow={isOpened}

diff --git a/packages/amis/src/renderers/Form/UserSelect.tsx b/packages/amis/src/renderers/Form/UserSelect.tsx
@@ -240,7 +240,8 @@ export default class UserSelectControl extends React.Component<
       data,
       displayFields,
       labelField,
-      loadingConfig
+      loadingConfig,
+      disabled
     } = this.props;
     tabOptions?.forEach((item: any) => {
       item.deferLoad = this.deferLoad;
@@ -260,6 +261,7 @@ export default class UserSelectControl extends React.Component<
             onSearch={this.onSearch}
             deferLoad={this.deferLoad}
             data={data}
+            disabled={disabled}
           />
         ) : (
           <UserSelect
@@ -280,6 +282,7 @@ export default class UserSelectControl extends React.Component<
             labelField={labelField}
             isDep={isDep}
             isRef={isRef}
+            disabled={disabled}
           />
         )}
       </div>