Browse Source

修改问题

tangning 2 years ago
parent
commit
4af4787d94

+ 2 - 2
src/views/device/putModal.vue

@@ -56,13 +56,13 @@
                 if (!value) {
                 if (!value) {
                   return Promise.reject('请输入wifi名称');
                   return Promise.reject('请输入wifi名称');
                 }
                 }
-                var list:string[] = ['4DKKPRO_','4DKKMI_','4DSS_','4DKK_'];
+                var list:string[] = ['4DKKPRO_','4DKKMI_','4DSS_','4DKK_','4DSG_'];
                 const some = list.some(item=>{
                 const some = list.some(item=>{
                   return value.indexOf(item) != -1
                   return value.indexOf(item) != -1
                 })
                 })
                 console.log('validator',some)
                 console.log('validator',some)
                 if(!some){
                 if(!some){
-                  return Promise.reject('wifi名称需包含前缀,如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”。');
+                  return Promise.reject('wifi名称需包含前缀,如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”。');
                 }
                 }
                 return Promise.resolve();
                 return Promise.resolve();
               },
               },

+ 2 - 0
src/views/product/firmware/AddModal.vue

@@ -217,6 +217,8 @@
             return t('routes.product.type.1');
             return t('routes.product.type.1');
           case 10:
           case 10:
             return t('routes.product.type.3');
             return t('routes.product.type.3');
+          case 13:
+            return t('routes.product.type.13');
           default:
           default:
             return '';
             return '';
         }
         }

+ 0 - 42
src/views/product/updataTips/AddModal.vue

@@ -87,27 +87,6 @@
           colProps: {
           colProps: {
             span: 20,
             span: 20,
           },
           },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                if (!value?.trim()) {
-                  return Promise.reject(t('common.inputText')+'中文标题');
-                }
-                if(/.*[\u4e00-\u9fa5]+.*$/.test(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持中文字符');
-                }
-                if(isEmojiCharacter(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持emoji表情');
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
           componentProps: {
           componentProps: {
             maxLength: 50,
             maxLength: 50,
           },
           },
@@ -120,27 +99,6 @@
           colProps: {
           colProps: {
             span: 20,
             span: 20,
           },
           },
-          rules: [
-            {
-              required: true,
-              // @ts-ignore
-              validator: async (rule, value) => {
-                if (!value?.trim()) {
-                  return Promise.reject(t('common.inputText')+'英文标题');
-                }
-                if(/.*[\u4e00-\u9fa5]+.*$/.test(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持中文字符');
-                }
-                if(isEmojiCharacter(value)){
-                  /* eslint-disable-next-line */
-                  return Promise.reject('不支持emoji表情');
-                }
-                return Promise.resolve();
-              },
-              trigger: 'change',
-            },
-          ],
           componentProps: {
           componentProps: {
             maxLength: 50,
             maxLength: 50,
           },
           },

+ 1 - 8
src/views/product/updataTips/index.vue

@@ -168,14 +168,7 @@ export default defineComponent({
             },
             },
           });
           });
         },
         },
-      },{
-        title: '发布状态',
-        dataIndex: 'status',
-        width: 80,
-        customRender: ({ record }) => {
-          return renderType(record.status)
-        },
-      },
+      }
     ];
     ];
     const [registerTimeTable, { reload }] = useTable({
     const [registerTimeTable, { reload }] = useTable({
       api: tipList,
       api: tipList,