Wzyyy98 3 سال پیش
والد
کامیت
59a5f2ea8b

+ 1 - 1
src/pages/device/components/Metadata/Base/Edit/index.tsx

@@ -707,7 +707,7 @@ const Edit = observer((props: Props) => {
             'x-decorator': 'FormItem',
             'x-component': 'Select',
             'x-component-props': {
-              mode: 'tags',
+              mode: 'multiple',
             },
             enum: [
               {

+ 2 - 2
src/pages/media/Cascade/Channel/index.tsx

@@ -92,13 +92,13 @@ const Channel = () => {
       ellipsis: true,
     },
     {
-      dataIndex: 'gbChannelId',
+      dataIndex: 'channelId',
       title: '国标ID',
       // ellipsis:true,
       tooltip: '国标级联有18位、20位两种格式。在当前页面修改不会修改视频设备-通道页面中的国标ID',
       render: (text: any, record: any) => (
         <div style={{ display: 'flex' }}>
-          <Ellipsis title={text || ''} />
+          <Ellipsis title={record.gbChannelId || ''} />
           <Popover
             visible={popVisible === record.id}
             trigger="click"

+ 1 - 1
src/pages/notice/Config/Detail/doc/DingTalk.tsx

@@ -7,7 +7,7 @@ const DingTalk = () => {
   return (
     <div className={'doc'}>
       <div className={'url'}>
-        钉钉开放台:
+        钉钉开放台:
         <a href="https://open-dev.dingtalk.com" target="_blank" rel="noopener noreferrer">
           https://open-dev.dingtalk.com
         </a>

+ 1 - 1
src/utils/util.ts

@@ -159,7 +159,7 @@ export const isNoCommunity = !(localStorage.getItem(SystemConst.Version_Code) ==
  */
 export const phoneRegEx = (value: string) => {
   const phone = new RegExp(
-    '^(((\\+86)|(\\+86-))|((86)|(86\\-))|((0086)|(0086\\-)))?1[3|5|7|8]\\d{9}$',
+    '^(((\\+86)|(\\+86-))|((86)|(86\\-))|((0086)|(0086\\-)))?1[3|5|7|8|9]\\d{9}$',
   );
   const mobile = /(0[0-9]{2,3})([2-9][0-9]{6,7})+([0-9]{8,11})?$/;
   return phone.test(value) || mobile.test(value);