控制台创建模板站

src/utils/helper/validator.ts

@@ -125,16 +125,14 @@ export const rules = {
     ] as ArrayRule;
   },
   existCheckRule(tableName, fieldName, model, schema, required?, message?) {
-    console.log(12313);
     return [
       {
         validator: (_, value) => {
-          console.log(!value && required, '!value && required!value && required');
-          if (!value && required) {
-            return Promise.reject(`请输入${schema.label}`);
-          } else {
+          // 如果不存在值，就直接默认通过验证，只验证输入值的情况
+          if (!value) {
             return Promise.resolve();
           }
+
           return new Promise<void>((resolve, reject) => {
             duplicateCheck({
               tableName,

src/views/adweb/site/components/GoogleAdsModal.vue

@@ -73,12 +73,16 @@
       const params = {
         siteCode: data.record.code,
       };
+
+      // 初始化默认写入siteCode
+      setFieldsValue({
+        siteCode: data.record.code,
+      });
       const res = await getGoogleAdsAccount(params);
       if (res) {
         setFieldsValue({
           googleAdsAccount: res.customerId,
           apiRefreshToken: res.refreshToken,
-          siteCode: data.record.code,
         });
       }
     } catch (error) {

src/views/adweb/theme/AdwebTheme.data.ts

@@ -71,7 +71,13 @@ export const formSchema: FormSchema[] = [
       return !!values.code && !!values.id;
     },
     dynamicRules: ({ model, schema }) => {
-      return [{ ...rules.existCheckRule('adweb_site', 'code', model, schema, true, '该临时站点不存在')[0], trigger: 'blur' }];
+      return [{ ...rules.existCheckRule('adweb_site', 'code', model, schema, false, '该临时站点不存在')[0], trigger: 'blur' }];
+    },
+    helpMessage: '请输入已经存在的临时站点code，系统将会自动生成该模板站点',
+    //自定义提示属性，需要结合helpMessage一起使用
+    helpComponentProps: {
+      maxWidth: '200px',
+      color: '#FFF',
     },
   },
   {

src/views/adweb/theme/components/AdwebThemeForm.vue

@@ -77,7 +77,6 @@
    * 提交数据
    */
   async function submitForm() {
-    confirmLoading.value = true;
     try {
       let values = await validate();
 
@@ -85,19 +84,19 @@
       //提交表单
       let isUpdateVal = unref(isUpdate);
 
-      let resultss = await saveOrUpdate(values, isUpdateVal);
+      confirmLoading.value = true;
+      let results = await saveOrUpdate(values, isUpdateVal);
 
-      if (resultss.code === 200) {
+      if (results.code === 200) {
         emit('ok');
         createMessage.success('模板添加成功');
       } else {
-        createMessage.error(resultss.message);
+        createMessage.error(results.message);
       }
 
       emit('ok');
     } finally {
       confirmLoading.value = false;
-      emit('ok');
     }
   }