feat(merge): merge wzy

Next wzy

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

@@ -25,7 +25,7 @@ interface UserProps {
 
 export default (props: UserProps) => {
   const [source, setSource] = useState(props.value?.source);
-  const [value, setValue] = useState<string | undefined>('');
+  const [value, setValue] = useState<string | undefined>();
   const [userList, setUserList] = useState({ platform: [], relation: [] });
   const [relationList, setRelationList] = useState([]);
 

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

@@ -366,6 +366,9 @@ const TriggerTerm = (props: Props, ref: any) => {
                           'value[0]': {
                             type: 'string',
                             'x-component': 'Input',
+                            'x-component-props': {
+                              placeholder: '请输入过滤条件值',
+                            },
                             'x-decorator': 'FormItem',
                             'x-decorator-props': {
                               style: {

src/pages/system/Platforms/Api/swagger-ui/debugging.tsx

@@ -141,7 +141,7 @@ export default observer(() => {
             column2: {
               type: 'void',
               'x-component': 'ArrayTable.Column',
-              'x-component-props': { title: '参数名称' },
+              'x-component-props': { title: '参数值' },
               properties: {
                 values: {
                   type: 'string',

src/pages/system/Platforms/index.tsx

@@ -109,7 +109,7 @@ export default () => {
       }),
       valueType: 'option',
       align: 'center',
-      width: 200,
+      width: 250,
       render: (_, record: any) => [
         <PermissionButton
           key={'update'}

src/pages/system/Platforms/password.tsx

@@ -139,10 +139,12 @@ export default (props: SaveProps) => {
   const modalClose = () => {
     if (props.onCancel) {
       props.onCancel();
+      form.reset();
     }
   };
 
   const saveData = useCallback(async () => {
+    console.log(props.data.id);
     const data: any = await form.submit();
     if (data) {
       setLoading(true);
@@ -151,6 +153,7 @@ export default (props: SaveProps) => {
       if (resp.status === 200) {
         modalClose();
         message.success('操作成功');
+        await form.reset();
       }
     }
   }, [props.data]);

src/pages/system/Role/Detail/UserManage/index.tsx

@@ -39,7 +39,7 @@ const UserManage = () => {
         id: 'pages.system.username',
         defaultMessage: '用户名',
       }),
-      align: 'center',
+      // align: 'center',
       dataIndex: 'username',
       ellipsis: true,
     },