eoss 0.1.0-alpha.37 → 0.1.0-alpha.39

package/packages/main/src/minxs.js

@@ -1391,13 +1391,13 @@ export default {
               this.setTips(this.business);
               this.setTips(this.systems);
             } else {
-              this.$message.error('未分配应用菜单权限，请联系管理员！');
+              Message.error('未分配应用菜单权限，请联系管理员！');
             }
             this.getMenus(loadingInstance);
           } else {
             loadingInstance.close();
             let msg = res.msg || '系统错误，请联系管理员！';
-            this.$message.error(msg);
+            Message.error(msg);
           }
         })
         .catch(() => {
@@ -1423,11 +1423,11 @@ export default {
               this.menus = res.results;
               this.renderMenus(this.menus);
             } else {
-              this.$message.error('未分配菜单权限，请联系管理员！');
+              Message.error('未分配菜单权限，请联系管理员！');
             }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
-            this.$message.error(msg);
+            Message.error(msg);
           }
         })
         .catch(() => {
@@ -1479,11 +1479,11 @@ export default {
             }
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
-            this.$message.error(msg);
+            Message.error(msg);
           }
         })
         .catch(() => {
-          this.$message.error('系统错误，请联系管理员！');
+          Message.error('系统错误，请联系管理员！');
         });
     },
     /**
@@ -1585,7 +1585,7 @@ export default {
           } else {
             this.subMenus = null;
             this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
+            Message.error('未分配菜单权限，请联系管理员！');
           }
         } else {
           let subMenus = this.getMenu(this.menus, this.appCode, 'appCode');
@@ -1609,7 +1609,7 @@ export default {
           } else {
             this.subMenus = null;
             this.showMenu = false;
-            this.$message.error('未分配菜单权限，请联系管理员！');
+            Message.error('未分配菜单权限，请联系管理员！');
           }
         }
       } else if (
@@ -2274,7 +2274,11 @@ export default {
         if (tabs[i].method === 'iframe') {
           this.$set(this.tabs[i], 'url', timestampUrl(this.tabs[i].url));
         }
-        if (this.tabs[i].method === 'router') {
+        // router/wujie 统一走 keys 变化触发刷新（点菜单=刷新一次）
+        if (
+          this.tabs[i].method === 'router' ||
+          this.tabs[i].method === 'wujie'
+        ) {
           this.$set(this.tabs[i], 'keys', uuid());
         }
         this.activeName = res.id;
@@ -2660,7 +2664,7 @@ export default {
           }
         }
       } else {
-        this.$message.error('没有此菜单！');
+        Message.error('没有此菜单！');
       }
     },
     // 监听改变菜单

package/packages/menu/src/menu.vue

@@ -40,7 +40,7 @@
               :open-icon="openIcon"
               :close-icon="closeIcon"
               :isFourthTabs="isFourthTabs"
-              :iconColor="getColor(index)"
+              :iconColor="getColor(index, item)"
               :iconColors="iconColors"
             ></component>
           </slot>

package/packages/menu/src/mixins.js

@@ -49,7 +49,7 @@ export default {
       return componentType;
     },
     // 获取菜单图标颜色
-    getColor(index) {
+    getColor(index, item) {
       if (!this.iconColors) {
         return undefined;
       }
@@ -58,7 +58,7 @@ export default {
       if (!this._colorCache) {
         this._colorCache = {};
       }
-
+      const isParentMenuIcon = item.children && item.children.length || (this.isFourthTabs && item.fourthTabs && item.fourthTabs.length);
       const key = Array.isArray(this.iconColors) ? `index_${index % this.iconColors.length}` : 'single_color';
 
       if (!this._colorCache[key]) {
@@ -66,7 +66,7 @@ export default {
         this._colorCache[key] = {
           '--icon-bg-color': bgColor,
           '--icon-color': '#fff',
-          '--icon-font-size': '12px'
+          '--icon-font-size': isParentMenuIcon ? '16px' : '12px'
         };
       }
 
@@ -89,7 +89,7 @@ export default {
       }
 
       const { id, index, open, extendData, ...rest } = item;
-      const openStatus = open || Boolean(extendData.openStatus);
+      const openStatus = open || extendData ? Boolean(extendData.openStatus) : false;
       let props;
       if (this.isFourthTabs) {
         if ((item.children && item.children.length) || (item.fourthTabs && item.fourthTabs.length)) {

package/packages/phone-login/src/phone-login.vue

@@ -70,6 +70,7 @@ import EsButton from 'eoss/packages/button';
 import EsForm from 'eoss/packages/form';
 import EsFormItem from 'eoss/packages/form-item';
 import EsInput from 'eoss/packages/input';
+import Message from 'eoss/packages/message';
 /**
  * 短信验证码登录组件
  * @description 用于通过短信验证码进行登录的组件
@@ -291,10 +292,9 @@ export default {
                   if (rCode === 0) {
                     this.$emit('success', results);
                   } else {
-                    error(res.msg || '登录失败！', () => {
-                      this.$emit('error', res);
-                      this.getImgCode();
-                    });
+                    Message.error(res.msg || '登录失败！');
+                    this.$emit('error', res);
+                    this.resetCode();
                   }
                 })
                 .catch(() => {

package/packages/process-config/src/FormList.vue

@@ -11,6 +11,8 @@
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import EsForm from 'eoss/packages/form';
+import Message from 'eoss/packages/message';
+
 export default {
   name: 'FormList',
   components: { EsForm },
@@ -169,14 +171,18 @@ export default {
       ajax({
         url: this.url,
         params: { id: this.id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.formData = res.results;
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            this.formData = res.results;
+          } else {
+            Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     }
   }
 };

package/packages/process-config/src/NodeConfig.vue

@@ -40,6 +40,7 @@ import {
 import NodeForm from './NodeForm';
 import EsDataTable from 'eoss/packages/data-table';
 import EsDialog from 'eoss/packages/dialog';
+import Message from 'eoss/packages/message';
 export default {
   name: 'NodeConfig',
   components: { NodeForm, EsDataTable, EsDialog },
@@ -154,19 +155,23 @@ export default {
           method: 'post',
           url: `/${this.bootName}${nodeSave}`,
           data: { ...data, mainId: this.mainid }
-        }).then((res) => {
-          loadingInstance.close();
-          if (res.rCode === 0) {
-            this.show = false;
-            this.$message({
-              type: 'success',
-              message: res.msg
-            });
-            this.$refs.table.getData();
-          } else {
-            return this.$message.error(res.msg);
-          }
-        });
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
       } else if (this.title === '编辑') {
         delete data.createTime;
         delete data.updateTime;
@@ -174,39 +179,47 @@ export default {
           method: 'post',
           url: `/${this.bootName}${nodeUpdate}`,
           params: { ...data, mainId: this.mainid }
-        }).then((res) => {
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
+      }
+    },
+    handleDelete(id) {
+      const loadingInstance = loading('删除中...');
+      ajax({
+        method: 'post',
+        url: `/${this.bootName}${nodeDeleteJson}`,
+        data: { id }
+      })
+        .then((res) => {
           loadingInstance.close();
           if (res.rCode === 0) {
-            this.show = false;
-            this.$message({
+            Message({
               type: 'success',
               message: res.msg
             });
             this.$refs.table.getData();
           } else {
-            return this.$message.error(res.msg);
+            return Message.error(res.msg);
           }
+        })
+        .catch(() => {
+          loadingInstance.close();
         });
-      }
-    },
-    handleDelete(id) {
-      const loadingInstance = loading('删除中...');
-      ajax({
-        method: 'post',
-        url: `/${this.bootName}${nodeDeleteJson}`,
-        data: { id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          });
-          this.$refs.table.getData();
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
     }
   }
 };

package/packages/process-config/src/NodeForm.vue

@@ -11,6 +11,7 @@
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 
+import Message from 'eoss/packages/message';
 import EsForm from 'eoss/packages/form';
 export default {
   name: 'FormList',
@@ -195,44 +196,48 @@ export default {
       ajax({
         url: this.url,
         params: { id: this.id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          if (res.results) {
-            res.results.nodeIsSms = res.results.nodeIsSms
-              ? res.results.nodeIsSms + ''
-              : '2';
-            this.formData = res.results;
-            this.$set(
-              this.formData,
-              'info',
-              `注：
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            if (res.results) {
+              res.results.nodeIsSms = res.results.nodeIsSms
+                ? res.results.nodeIsSms + ''
+                : '2';
+              this.formData = res.results;
+              this.$set(
+                this.formData,
+                'info',
+                `注：
                 1、需要短信通知时，在指定的时间间隔内，当前节点对同一审核用户不再发送短信
                 2、起始时间以第一次接收短信的时间为准
                 3、时间间隔单位为分钟，0：始终发送短信 其它正整数：间隔时间内不再接收短信`
-            );
-            if (res.results.specifiedCompany) {
-              let nameArr = res.results.specifiedCompany
-                .split(',')
-                .map((item) => {
-                  return { showname: item };
+              );
+              if (res.results.specifiedCompany) {
+                let nameArr = res.results.specifiedCompany
+                  .split(',')
+                  .map((item) => {
+                    return { showname: item };
+                  });
+                let idArr = res.results.specifiedCompanyid
+                  .split(',')
+                  .map((item) => {
+                    return { showid: item };
+                  });
+                let companyArr = nameArr.map((item, i) => {
+                  item.showid = idArr[i].showid;
+                  return item;
                 });
-              let idArr = res.results.specifiedCompanyid
-                .split(',')
-                .map((item) => {
-                  return { showid: item };
-                });
-              let companyArr = nameArr.map((item, i) => {
-                item.showid = idArr[i].showid;
-                return item;
-              });
-              this.formData.specifiedCompanyObj = companyArr;
+                this.formData.specifiedCompanyObj = companyArr;
+              }
             }
+          } else {
+            return Message.error(res.msg);
           }
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     }
   }
 };

package/packages/process-config/src/main.vue

@@ -60,6 +60,7 @@ import FormList from './FormList';
 import NodeConfig from './NodeConfig';
 import EsDataTable from 'eoss/packages/data-table';
 import EsDialog from 'eoss/packages/dialog';
+import Message from 'eoss/packages/message';
 export default {
   name: 'EsProcessConfig',
   components: { FormList, NodeConfig, EsDataTable, EsDialog },
@@ -200,19 +201,23 @@ export default {
             companyid: getStorage('orgId'),
             ...data
           }
-        }).then((res) => {
-          loadingInstance.close();
-          if (res.rCode === 0) {
-            this.show = false;
-            this.$message({
-              type: 'success',
-              message: res.msg
-            });
-            this.$refs.table.getData();
-          } else {
-            return this.$message.error(res.msg);
-          }
-        });
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
       } else if (this.title === '编辑') {
         delete data.createTime;
         delete data.updateTime;
@@ -220,39 +225,47 @@ export default {
           method: 'post',
           url: `/${this.bootName}${processUpdate}`,
           params: data
-        }).then((res) => {
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
+      }
+    },
+    handleDelete(id) {
+      const loadingInstance = loading('提交中...');
+      ajax({
+        method: 'post',
+        url: `/${this.bootName}${processDeleteJson}`,
+        data: { id }
+      })
+        .then((res) => {
           loadingInstance.close();
           if (res.rCode === 0) {
-            this.show = false;
-            this.$message({
+            Message({
               type: 'success',
               message: res.msg
             });
             this.$refs.table.getData();
           } else {
-            return this.$message.error(res.msg);
+            return Message.error(res.msg);
           }
+        })
+        .catch(() => {
+          loadingInstance.close();
         });
-      }
-    },
-    handleDelete(id) {
-      const loadingInstance = loading('提交中...');
-      ajax({
-        method: 'post',
-        url: `/${this.bootName}${processDeleteJson}`,
-        data: { id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          });
-          this.$refs.table.getData();
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
     }
   }
 };

package/packages/process-module/src/FormList.vue

@@ -11,6 +11,7 @@
 import { loading } from 'eoss/src/utils/util';
 import { ajax } from 'eoss/src/utils/ajax';
 import EsForm from 'eoss/packages/form';
+import Message from 'eoss/packages/message';
 export default {
   name: 'FormList',
   components: { EsForm },
@@ -159,17 +160,21 @@ export default {
       ajax({
         url: this.url,
         params: { id: this.id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.formData = res.results;
-          this.formData.ruleRepeat = res.results.ruleRepeat
-            ? res.results.ruleRepeat + ''
-            : '1';
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
+      })
+        .then((res) => {
+          loadingInstance.close();
+          if (res.rCode === 0) {
+            this.formData = res.results;
+            this.formData.ruleRepeat = res.results.ruleRepeat
+              ? res.results.ruleRepeat + ''
+              : '1';
+          } else {
+            return Message.error(res.msg);
+          }
+        })
+        .catch(() => {
+          loadingInstance.close();
+        });
     },
     cancel() {
       this.$emit('close', false);

package/packages/process-module/src/main.vue

@@ -45,6 +45,7 @@ import {
 import FormList from './FormList';
 import EsDataTable from 'eoss/packages/data-table';
 import EsDialog from 'eoss/packages/dialog';
+import Message from 'eoss/packages/message';
 export default {
   name: 'EsProcessModule',
   components: { FormList, EsDataTable, EsDialog },
@@ -165,20 +166,24 @@ export default {
           data: postData
 
           // headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-        }).then((res) => {
-          loadingInstance.close();
-          if (res.rCode === 0) {
-            this.show = false;
-            this.row = '';
-            this.$message({
-              type: 'success',
-              message: res.msg
-            });
-            this.$refs.table.getData();
-          } else {
-            return this.$message.error(res.msg);
-          }
-        });
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              this.row = '';
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
       } else if (this.title === '编辑') {
         delete data.createTime;
         delete data.updateTime;
@@ -186,40 +191,48 @@ export default {
           method: 'post',
           url: `/${this.bootName}${moduleUpdate}`,
           data: data
-        }).then((res) => {
+        })
+          .then((res) => {
+            loadingInstance.close();
+            if (res.rCode === 0) {
+              this.show = false;
+              this.row = '';
+              Message({
+                type: 'success',
+                message: res.msg
+              });
+              this.$refs.table.getData();
+            } else {
+              return Message.error(res.msg);
+            }
+          })
+          .catch(() => {
+            loadingInstance.close();
+          });
+      }
+    },
+    handleDelete(id) {
+      const loadingInstance = loading('删除中...');
+      ajax({
+        method: 'post',
+        url: `/${this.bootName}${moduleDelete}`,
+        data: { id }
+      })
+        .then((res) => {
           loadingInstance.close();
           if (res.rCode === 0) {
-            this.show = false;
-            this.row = '';
-            this.$message({
+            Message({
               type: 'success',
               message: res.msg
             });
             this.$refs.table.getData();
           } else {
-            return this.$message.error(res.msg);
+            return Message.error(res.msg);
           }
+        })
+        .catch(() => {
+          loadingInstance.close();
         });
-      }
-    },
-    handleDelete(id) {
-      const loadingInstance = loading('删除中...');
-      ajax({
-        method: 'post',
-        url: `/${this.bootName}${moduleDelete}`,
-        data: { id }
-      }).then((res) => {
-        loadingInstance.close();
-        if (res.rCode === 0) {
-          this.$message({
-            type: 'success',
-            message: res.msg
-          });
-          this.$refs.table.getData();
-        } else {
-          return this.$message.error(res.msg);
-        }
-      });
     },
     closeDialog() {
       // this.$refs.formList.resetForm();