fix: merge

fix: bug

src/components/Metadata/EnumParam/index.tsx

@@ -55,7 +55,7 @@ const EnumParam = () => {
                     },
                     {
                       required: true,
-                      message: '请输入标识',
+                      message: '请输入Text',
                     },
                   ],
                 },
@@ -74,7 +74,7 @@ const EnumParam = () => {
                     },
                     {
                       required: true,
-                      message: '请输入描述',
+                      message: '请输入Value',
                     },
                   ],
                 },

src/components/SearchComponent/index.tsx

@@ -212,7 +212,12 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
               }
               f.setFieldState(typeFiled.query('.value'), async (state) => {
                 state.componentType = 'Input';
-                state.componentProps = { allowClear: true };
+                state.componentProps = {
+                  allowClear: true,
+                  // onchange:(event:any)=>{
+                  //   console.log(event.target?.value)
+                  // }
+                };
               });
             } else {
               switch (_field?.valueType) {
@@ -710,6 +715,7 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
               handleSearch(false);
             }}
             type="primary"
+            htmlType={'submit'}
           >
             搜索
           </Button>
@@ -732,6 +738,7 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
         }}
         type="primary"
         overlay={historyDom}
+        htmlType={'submit'}
       >
         搜索
       </Dropdown.Button>
@@ -784,7 +791,13 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
 
   return (
     <Card bordered={false} className={styles.container}>
-      <Form form={form} className={styles.form} labelCol={4} wrapperCol={18}>
+      <Form
+        form={form}
+        className={styles.form}
+        labelCol={4}
+        wrapperCol={18}
+        onAutoSubmit={() => (SearchBtn.advance ? handleSearch : handleSearch(false))}
+      >
         <div className={expand && styles.simple}>
           <SchemaField schema={expand ? simpleSchema : schema} />
           <div className={styles.action} style={{ marginTop: expand ? 0 : -12 }}>

src/pages/device/Instance/Detail/Reation/index.tsx

@@ -25,7 +25,9 @@ const Reation = () => {
 
   useEffect(() => {
     if (id) {
-      setData(InstanceModel.detail?.relations || []);
+      const item = InstanceModel.detail?.relations?.reverse();
+      setData(item || []);
+      // console.log(InstanceModel.detail?.relations?.reverse() )
     }
   }, [InstanceModel.detail?.relations]);
 
@@ -55,7 +57,7 @@ const Reation = () => {
           </span>
         }
       >
-        {(data.reverse() || [])?.map((item: any) => (
+        {(data || [])?.map((item: any) => (
           <Descriptions.Item span={1} label={item.relationName} key={item.objectId}>
             <Ellipsis
               title={item?.related ? _.map(item?.related || [], 'name').join(',') : ''}

src/pages/device/Instance/Detail/Running/index.tsx

@@ -64,7 +64,12 @@ const Running = () => {
               </Tabs.TabPane>
             ))}
           </Tabs>
-          {list.length === 0 && <Empty description="暂无数据" style={{ marginTop: '10%' }} />}
+          {list.length === 0 && (
+            <div style={{ display: 'flex', justifyContent: 'flex-start' }}>
+              <Empty description="暂无数据" style={{ marginTop: '10%' }} />
+              <Empty description="暂无数据" style={{ marginTop: '10%', marginLeft: '30%' }} />
+            </div>
+          )}
         </div>
       )}
     </Card>

src/pages/device/Product/Save/index.tsx

@@ -313,6 +313,7 @@ const Save = (props: Props) => {
             >
               <RadioCard
                 model={'singular'}
+                disabled={!!props.data?.accessId}
                 options={[
                   {
                     label: intlFormat('pages.device.type.device', '直连设备'),

src/pages/init-home/components/data/save/index.tsx

@@ -117,7 +117,13 @@ const Save = (props: Props) => {
             required: true,
             'x-decorator': 'FormItem',
             'x-component': 'Input',
-            'x-validator': ['ipv4'],
+            'x-validator': [
+              'ipv4',
+              {
+                required: true,
+                message: '请输入域名或IP',
+              },
+            ],
             'x-component-props': {
               placeholder: '请输入公网地址',
             },
@@ -145,6 +151,10 @@ const Save = (props: Props) => {
                 min: 1,
                 message: '请输入1-65535之间的正整数',
               },
+              {
+                required: true,
+                message: '请输入公网端口',
+              },
             ],
           },
         },

src/pages/link/Certificate/index.tsx

@@ -47,7 +47,7 @@ const Certificate = () => {
     {
       dataIndex: 'description',
       title: '说明',
-      ellipsis: true,
+      // ellipsis: true,
       render: (text: any) => (
         <div style={{ width: '100%' }} className="ellipsis">
           <Tooltip placement="topLeft" title={text}>

src/pages/media/Cascade/Save/index.tsx

@@ -120,7 +120,7 @@ const Save = () => {
                 sipConfigs: {
                   transport: 'UDP',
                   keepaliveInterval: 60,
-                  registerInterval: 3000,
+                  registerInterval: 3600,
                 },
               }}
               onFinish={async (values: any) => {
@@ -155,7 +155,10 @@ const Save = () => {
                   <Form.Item
                     label="名称"
                     name="name"
-                    rules={[{ required: true, message: '请输入名称' }]}
+                    rules={[
+                      { required: true, message: '请输入名称' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入名称" />
                   </Form.Item>
@@ -199,7 +202,10 @@ const Save = () => {
                   <Form.Item
                     label="信令名称"
                     name={['sipConfigs', 'name']}
-                    rules={[{ required: true, message: '请输入信令名称' }]}
+                    rules={[
+                      { required: true, message: '请输入信令名称' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入信令名称" />
                   </Form.Item>
@@ -208,7 +214,10 @@ const Save = () => {
                   <Form.Item
                     label="上级SIP ID"
                     name={['sipConfigs', 'sipId']}
-                    rules={[{ required: true, message: '请输入上级SIP ID' }]}
+                    rules={[
+                      { required: true, message: '请输入上级SIP ID' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入上级SIP ID" />
                   </Form.Item>
@@ -217,7 +226,10 @@ const Save = () => {
                   <Form.Item
                     label="上级SIP域"
                     name={['sipConfigs', 'domain']}
-                    rules={[{ required: true, message: '请输入上级平台SIP域' }]}
+                    rules={[
+                      { required: true, message: '请输入上级平台SIP域' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入上级平台SIP域" />
                   </Form.Item>
@@ -238,7 +250,10 @@ const Save = () => {
                   <Form.Item
                     label="本地SIP ID"
                     name={['sipConfigs', 'localSipId']}
-                    rules={[{ required: true, message: '请输入网关侧的SIP ID' }]}
+                    rules={[
+                      { required: true, message: '请输入网关侧的SIP ID' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="网关侧的SIP ID" />
                   </Form.Item>
@@ -296,7 +311,10 @@ const Save = () => {
                   <Form.Item
                     label="用户"
                     name={['sipConfigs', 'user']}
-                    rules={[{ required: true, message: '请输入用户' }]}
+                    rules={[
+                      { required: true, message: '请输入用户' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入用户" />
                   </Form.Item>
@@ -305,7 +323,10 @@ const Save = () => {
                   <Form.Item
                     label="接入密码"
                     name={['sipConfigs', 'password']}
-                    rules={[{ required: true, message: '请输入接入密码' }]}
+                    rules={[
+                      { required: true, message: '请输入接入密码' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input.Password placeholder="请输入接入密码" />
                   </Form.Item>
@@ -314,7 +335,10 @@ const Save = () => {
                   <Form.Item
                     label="厂商"
                     name={['sipConfigs', 'manufacturer']}
-                    rules={[{ required: true, message: '请输入厂商' }]}
+                    rules={[
+                      { required: true, message: '请输入厂商' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入厂商" />
                   </Form.Item>
@@ -323,7 +347,10 @@ const Save = () => {
                   <Form.Item
                     label="型号"
                     name={['sipConfigs', 'model']}
-                    rules={[{ required: true, message: '请输入型号' }]}
+                    rules={[
+                      { required: true, message: '请输入型号' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入型号" />
                   </Form.Item>
@@ -332,7 +359,10 @@ const Save = () => {
                   <Form.Item
                     label="版本号"
                     name={['sipConfigs', 'firmware']}
-                    rules={[{ required: true, message: '请输入版本号' }]}
+                    rules={[
+                      { required: true, message: '请输入版本号' },
+                      { max: 64, message: '最大长度64字符' },
+                    ]}
                   >
                     <Input placeholder="请输入版本号" />
                   </Form.Item>

src/pages/media/Device/Save/index.tsx

@@ -147,6 +147,7 @@ const Save = () => {
                           console.log(key);
                           setAccessType(key);
                           queryProduct(key);
+                          form.resetFields(['id']);
                         }}
                         disabled={id}
                         options={[

src/pages/media/Device/index.tsx

@@ -272,10 +272,10 @@ const Device = () => {
           tooltip={
             record.state.value === 'offline' ||
             record.state.value === 'notActive' ||
-            record.provider === providerType['fixed-media']
+            record.provider === 'fixed-media'
               ? {
                   title:
-                    record.provider === providerType['fixed-media']
+                    record.provider === 'fixed-media'
                       ? '固定地址无法更新通道'
                       : record.state.value === 'offline'
                       ? '设备已离线'
@@ -290,7 +290,7 @@ const Device = () => {
           disabled={
             record.state.value === 'offline' ||
             record.state.value === 'notActive' ||
-            record.provider === providerType['fixed-media']
+            record.provider === 'fixed-media'
           }
           style={{ padding: 0 }}
           type={'link'}
@@ -426,10 +426,10 @@ const Device = () => {
                 key={'updateChannel'}
                 isPermission={permission.update}
                 tooltip={
-                  record.state.value !== 'online' || record.provider === providerType['fixed-media']
+                  record.state.value !== 'online' || record.provider === 'fixed-media'
                     ? {
                         title:
-                          record.provider === providerType['fixed-media']
+                          record.provider === 'fixed-media'
                             ? '固定地址无法更新通道'
                             : record.state.value === 'offline'
                             ? '设备已离线'
@@ -439,9 +439,7 @@ const Device = () => {
                       }
                     : undefined
                 }
-                disabled={
-                  record.state.value !== 'online' || record.provider === providerType['fixed-media']
-                }
+                disabled={record.state.value !== 'online' || record.provider === 'fixed-media'}
                 onClick={() => {
                   updateChannel(record.id);
                 }}

src/pages/media/Home/deviceModal.tsx

@@ -129,7 +129,7 @@ export default (props: DeviceModalProps) => {
         search={false}
         columnEmptyText={''}
         request={(params) =>
-          service.query({
+          service.getDevice({
             ...params,
             sorts: [
               {

src/pages/media/Home/index.tsx

@@ -18,7 +18,7 @@ export const service = new Service('media');
 
 export default () => {
   const dashBoardUrl = getMenuPathByCode('media/DashBoard');
-  const deviceUrl = getMenuPathByCode('media/Device');
+  const deviceUrl = getMenuPathByCode('media/Device/Save');
   const channelUrl = getMenuPathByCode('media/Device/Channel');
   const cascadeUrl = getMenuPathByCode('media/Cascade');
   const splitScreenUrl = getMenuPathByCode('media/SplitScreen');

src/pages/media/Home/service.tsx

@@ -8,6 +8,8 @@ class Service extends BaseService<DeviceItem> {
 
   channelCount = (data: any = {}) =>
     request(`${this.uri}/channel/_count`, { method: 'POST', data: data });
+  getDevice = (data: any = {}) =>
+    request(`${this.uri}/device/_query/`, { method: 'POST', data: data });
 }
 
 export default Service;

src/pages/notice/Template/Detail/doc/AliyunVoice.tsx

@@ -21,7 +21,9 @@ const AliyunVoice = () => {
         <h2> 2、模板ID</h2>
         <div> 阿里云语音对每一条语音通知分配的唯一ID标识</div>
         <h2> 3、被叫号码</h2>
-        <div> 当前仅支持国内手机号，此处若不填，则在模板调试和配置告警通知时手动填写</div>
+        <div> 当前仅支持国内手机号，此处若不填，则在模板调试和配置告警通知时手动填写。</div>
+        <div>若您使用的语音通知文件为公共模式外呼，则该参数值不填。</div>
+        <div>若您使用的语音通知文件为专属模式外呼，则必须传入已购买的号码，仅支持一个号码。</div>
         <h2> 4、被叫显号</h2>
         <div> 用户呼叫号码显示，必须是在阿里云购买的号码。</div>
         <h2> 5、播放次数</h2>

src/pages/notice/Template/Detail/index.tsx

@@ -617,7 +617,7 @@ const Detail = observer(() => {
                         },
                       },
                       toParty: {
-                        title: '收信组织',
+                        title: '收信部门',
                         'x-component': 'Select',
                         'x-decorator': 'FormItem',
                         // 'x-decorator-props': {
@@ -625,7 +625,7 @@ const Detail = observer(() => {
                         //   gridSpan: 1,
                         // },
                         'x-component-props': {
-                          placeholder: '请选择收信组织',
+                          placeholder: '请选择收信部门',
                         },
                       },
                     },
@@ -835,7 +835,7 @@ const Detail = observer(() => {
                     },
                     properties: {
                       departmentIdList: {
-                        title: '收信组织',
+                        title: '收信部门',
                         // required: true,
                         'x-component': 'Select',
                         'x-decorator': 'FormItem',
@@ -844,7 +844,7 @@ const Detail = observer(() => {
                         //   gridSpan: 1,
                         // },
                         'x-component-props': {
-                          placeholder: '请选择收信组织',
+                          placeholder: '请选择收信部门',
                         },
                         // 'x-reactions': {
                         //   dependencies: ['configId'],

src/pages/notice/Template/index.tsx

@@ -283,7 +283,7 @@ const Template = observer(() => {
 
             <PermissionButton
               popConfirm={{
-                title: '确认导出当前页数据？',
+                title: '确认导出？',
                 onConfirm: async () => {
                   const resp: any = await service.queryNoPagingPost({ ...param, paging: false });
                   if (resp.status === 200) {

src/pages/rule-engine/Alarm/Config/index.tsx

@@ -215,6 +215,12 @@ const Config = () => {
               'x-decorator-props': {
                 gridSpan: 23,
               },
+              'x-validator': [
+                {
+                  max: 64,
+                  message: '最多输入64个字符',
+                },
+              ],
             },
             // remove: {
             //   type: 'void',

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

@@ -118,7 +118,7 @@ const UserManage = () => {
         tableAlertOptionRender={() => (
           <Space size={16}>
             <Popconfirm
-              title="确认解绑嘛"
+              title="确认解绑"
               onConfirm={() => {
                 setSelectedRowKeys([]);
                 unBindUser(params.id, [...selectedRowKeys]);