Merge xyh

Next xyh

src/pages/rule-engine/Scene/Save/action/action.tsx

@@ -174,6 +174,7 @@ export default observer((props: ActionProps) => {
           rules={[{ required: true, message: '请选择通知方式' }]}
         >
           <Select
+            allowClear
             options={messageType}
             fieldNames={{ value: 'id', label: 'name' }}
             placeholder={'请选择通知方式'}
@@ -195,6 +196,7 @@ export default observer((props: ActionProps) => {
           rules={[{ required: true, message: '请选择通知配置' }]}
         >
           <Select
+            allowClear
             options={messageConfig}
             loading={messageConfigLoading}
             fieldNames={{ value: 'id', label: 'name' }}
@@ -216,6 +218,7 @@ export default observer((props: ActionProps) => {
           rules={[{ required: true, message: '请选择通知模板' }]}
         >
           <Select
+            allowClear
             options={messageTemplate}
             loading={messageTemplateLoading}
             fieldNames={{ value: 'id', label: 'name' }}
@@ -295,6 +298,7 @@ export default observer((props: ActionProps) => {
             rules={[{ required: true, message: '请选择执行条件' }]}
           >
             <Select
+              allowClear
               options={
                 !props.parallel
                   ? [

src/pages/rule-engine/Scene/TriggerTerm/index.tsx

@@ -306,6 +306,9 @@ const TriggerTerm = (props: Props, ref: any) => {
                     type: 'string',
                     // "x-decorator": 'FormItem',
                     'x-component': 'FTermTypeSelect',
+                    'x-component-props': {
+                      allowClear: true,
+                    },
                     'x-value': 'and',
                   },
                   layout: {
@@ -328,6 +331,7 @@ const TriggerTerm = (props: Props, ref: any) => {
                         'x-component-props': {
                           placeholder: '请选择参数',
                           fieldNames: { value: 'column', label: 'name', options: 'children' },
+                          allowClear: true,
                           // treeNodeLabelProp: 'name',
                         },
                         'x-reactions': '{{useAsyncDataSource(getParseTerm)}}',

src/pages/system/Menu/Detail/buttons.tsx

@@ -340,6 +340,7 @@ export default (props: ButtonsProps) => {
             required={true}
           >
             <Input
+              allowClear
               onChange={debounce(filterThree, 500)}
               style={{ width: 300, marginBottom: 12 }}
               placeholder={'请输入权限名称'}

src/pages/system/Menu/Detail/edit.tsx

@@ -295,6 +295,7 @@ export default (props: EditProps) => {
                   })}
                 >
                   <Input
+                    allowClear
                     onChange={debounce(filterThree, 500)}
                     style={{ width: 300, marginBottom: 12 }}
                     placeholder={'请输入权限名称'}