Parcourir la source

fix: bug#9369、9376、9388

xieyonghong il y a 3 ans
Parent
commit
e2732b1a67

+ 9 - 0
src/pages/rule-engine/Scene/Save/manual/index.tsx

@@ -13,8 +13,17 @@ export default () => {
             rules={[
               {
                 validator(_, v) {
+                  console.log(v);
                   if (!v || (v && !v.length)) {
                     return Promise.reject('至少配置一个执行动作');
+                  } else {
+                    let isActions = false;
+                    v.forEach((item: any) => {
+                      if (item.actions && item.actions.length) {
+                        isActions = true;
+                      }
+                    });
+                    return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作');
                   }
                   return Promise.resolve();
                 },

+ 10 - 0
src/pages/rule-engine/Scene/Save/terms/branchItem.tsx

@@ -150,6 +150,16 @@ export default observer((props: BranchesItemProps) => {
                       validator(_, v) {
                         if (!v || (v && !v.length)) {
                           return Promise.reject('至少配置一个执行动作');
+                        } else {
+                          let isActions = false;
+                          v.forEach((item: any) => {
+                            if (item.actions && item.actions.length) {
+                              isActions = true;
+                            }
+                          });
+                          return isActions
+                            ? Promise.resolve()
+                            : Promise.reject('至少配置一个执行动作');
                         }
                         return Promise.resolve();
                       },

+ 8 - 0
src/pages/rule-engine/Scene/Save/terms/index.tsx

@@ -190,6 +190,14 @@ export default observer((props: Props) => {
               validator(_, v) {
                 if (!v || (v && !v.length)) {
                   return Promise.reject('至少配置一个执行动作');
+                } else {
+                  let isActions = false;
+                  v.forEach((item: any) => {
+                    if (item.actions && item.actions.length) {
+                      isActions = true;
+                    }
+                  });
+                  return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作');
                 }
                 return Promise.resolve();
               },

+ 8 - 0
src/pages/rule-engine/Scene/Save/timer/index.tsx

@@ -82,6 +82,14 @@ export default observer((props: Props) => {
                   validator(_, v) {
                     if (!v || (v && !v.length)) {
                       return Promise.reject('至少配置一个执行动作');
+                    } else {
+                      let isActions = false;
+                      v.forEach((item: any) => {
+                        if (item.actions && item.actions.length) {
+                          isActions = true;
+                        }
+                      });
+                      return isActions ? Promise.resolve() : Promise.reject('至少配置一个执行动作');
                     }
                     return Promise.resolve();
                   },

+ 10 - 0
src/pages/system/Menu/Setting/baseMenu.ts

@@ -2872,6 +2872,16 @@ export default [
         permissions: [],
         buttons: [
           {
+            id: 'view',
+            name: '查看',
+            permissions: [
+              {
+                permission: 'system_config',
+                actions: ['query'],
+              },
+            ],
+          },
+          {
             id: 'update',
             name: '保存',
             permissions: [