eoss-ui 0.5.43 → 0.5.44

package/packages/flow/src/component/CustomPreset.vue

@@ -1,6 +1,9 @@
 <template>
   <el-collapse v-model="activeNames" accordion>
-    <el-collapse-item :title="customPresetHintMessage || '预设节点信息（折叠不作处理）'" name="1">
+    <el-collapse-item
+      :title="customPresetHintMessage || '预设节点信息（折叠不作处理）'"
+      name="1"
+    >
       <div v-for="(item, index) of newPresetList" :key="index">
         <el-form-item prop="flow" :label="`➤ 节点${index + 1}`">
           <el-select
@@ -77,6 +80,7 @@ export default {
   watch: {
     activeNames(val) {
       this.$emit('changeActiveNames', val);
+      this.$emit('change-active-names', val);
     },
     processDefinitionId: {
       handler(val) {
@@ -99,6 +103,7 @@ export default {
         return;
       }
       this.$emit('loadingStart');
+      this.$emit('loading-start');
       this.show = false;
       this.getPresetFlowInfo(nodeId, processDefinitionId);
       // return
@@ -114,7 +119,7 @@ export default {
       };
       util
         .ajax({ url: getNodeInfo, params })
-        .then(res => {
+        .then((res) => {
           const {
             status,
             message,
@@ -134,7 +139,7 @@ export default {
             info.presetEdit = 0;
             info.presetEdit = nodeExtAttr.presetEdit;
             info.isDefSelectedObj = nodeExtAttr.isDefSelectedObj;
-            nextUserList.map(item => {
+            nextUserList.map((item) => {
               if (info.multiple && info.isDefSelectedObj == 1) {
                 info.nextUser.push(item.userId);
                 info.selectUserList.push({
@@ -168,6 +173,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
           this.$emit('loadingEnd');
+          this.$emit('loading-end');
           nodeId &&
             setTimeout(() => {
               this.$refs.selectUser[index].changeInfo(
@@ -175,7 +181,7 @@ export default {
               );
             }, 500);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -226,7 +232,7 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { status, data } = res;
           if (status === 'success') {
             let list = [
@@ -279,7 +285,7 @@ export default {
             }
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -293,7 +299,7 @@ export default {
     },
     changeSelectData() {
       let customPresetUserJson = [];
-      this.newPresetList.map(item => {
+      this.newPresetList.map((item) => {
         customPresetUserJson.push({
           name: item.name,
           lastName: item.lastName,
@@ -307,6 +313,7 @@ export default {
         });
       });
       this.$emit('changeCustom', customPresetUserJson);
+      this.$emit('change-custom', customPresetUserJson);
     }
   }
 };

package/packages/flow/src/component/FileList.vue

@@ -62,6 +62,7 @@ export default {
   methods: {
     successFile(response, file, fileList) {
       this.$emit('changeFileNum', fileList.length);
+      this.$emit('change-file-num', fileList.length);
     },
     //删除附件
     delFile(file, fileList) {
@@ -75,16 +76,17 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { rCode, msg } = res;
           if (rCode == 0) {
             this.$message.success('删除成功');
             this.$emit('changeFileNum', fileList.length);
+            this.$emit('change-fFile-num', fileList.length);
           } else {
             this.$message.error(msg || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }

package/packages/flow/src/component/Preset.vue

@@ -103,13 +103,14 @@ export default {
   methods: {
     changeSelectData() {
       let presetUserJson = [];
-      this.nodeList.map(item => {
+      this.nodeList.map((item) => {
         presetUserJson.push({
           name: item.name,
           value: item.multiple ? item.nextUser.join(',') : item.nextUser
         });
       });
       this.$emit('changePreset', presetUserJson);
+      this.$emit('change-preset', presetUserJson);
     },
     changePresetUser(val, index) {
       const { nextUser } = val;
@@ -129,13 +130,9 @@ export default {
     },
     getNodeUser() {
       this.$emit('loadingStart');
-      const {
-        nextNodeId,
-        processDefinitionId,
-        businessId,
-        pendingId,
-        nodeId
-      } = this;
+      this.$emit('loading-start');
+      const { nextNodeId, processDefinitionId, businessId, pendingId, nodeId } =
+        this;
       let params = {
         url: getPresetNodeInfo,
         params: {
@@ -149,11 +146,11 @@ export default {
       };
       util
         .ajax(params)
-        .then(res => {
+        .then((res) => {
           const { status, message, data } = res;
           if (status == 'success') {
             if (data) {
-              this.nodeList.map(item => {
+              this.nodeList.map((item) => {
                 for (let key in data) {
                   if (item.name === key) {
                     item.configInfo = data[key];
@@ -166,7 +163,7 @@ export default {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -174,7 +171,7 @@ export default {
     },
     getConfig() {
       this.nodeList = this.nodeList.filter(
-        item => item.name.indexOf(this.nodeId) == -1
+        (item) => item.name.indexOf(this.nodeId) == -1
       );
       this.nodeList.map((item, index) => {
         const { multiple, params } = this.isMultiple(
@@ -188,7 +185,7 @@ export default {
         item.radioList = [];
         item.selectUserList = [];
         item.isDefSelectedObj = item.configInfo.nodeExtAttr.isDefSelectedObj;
-        item.configInfo.nextUserList.map(items => {
+        item.configInfo.nextUserList.map((items) => {
           if (item.multiple && item.isDefSelectedObj == 1) {
             item.nextUser.push(items.userId);
             item.selectUserList.push({
@@ -218,6 +215,7 @@ export default {
       });
       this.changeSelectData();
       this.$emit('loadingEnd');
+      this.$emit('loading-end');
     },
     isMultiple(val, choiceOrgId, choiceDeptId, pOrgId) {
       let multiple = false;

package/packages/flow/src/form.vue

@@ -30,7 +30,7 @@
       <!-- <el-form-item> -->
       <!-- </el-form-item> -->
     </el-form>
-    <div style="text-align:right">
+    <div style="text-align: right">
       <el-button
         v-show="showSubBtn"
         type="primary"
@@ -90,7 +90,7 @@ export default {
           url: id ? editCommonOpion : addCommonOpion,
           params: { id }
         })
-        .then(res => {
+        .then((res) => {
           const { status, message, data } = res;
           if (status == 'success') {
             this.newData = data.bean;
@@ -99,7 +99,7 @@ export default {
           }
           this.loading = false;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -107,9 +107,10 @@ export default {
         });
     },
     submitForm(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.$emit('subMit', { addVisible: false, data: this.newData });
+          this.$emit('sub-mit', { addVisible: false, data: this.newData });
         } else {
           return false;
         }

package/packages/flow/src/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="es-flow-index"
-    :class="{ 'es-flow-narrow': shrink ,required:this.requiredValue}"
+    :class="{ 'es-flow-narrow': shrink, required: this.requiredValue }"
     :style="styles"
     v-if="!shrinkAbled"
   >
@@ -744,7 +744,7 @@ export default {
       nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
-      requiredValue:false,
+      requiredValue: false,
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
@@ -1333,8 +1333,7 @@ export default {
           .then((next) => {
             if (!this.value) {
               // return this.$message.warning('请填写意见');
-        return this.requiredValue = true
-
+              return (this.requiredValue = true);
             }
             this.showReject = true;
           })
@@ -1342,7 +1341,7 @@ export default {
       } else {
         if (!this.value) {
           // return this.$message.warning('请填写意见');
-          return this.requiredValue = true
+          return (this.requiredValue = true);
         }
         this.showReject = true;
       }
@@ -1659,8 +1658,8 @@ export default {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           if (this.isOpinionRequired == 1 && (this.value == '' || !this.value))
-          return this.requiredValue = true
-            // return this.$message.warning('请填写意见');
+            return (this.requiredValue = true);
+          // return this.$message.warning('请填写意见');
           let params = {
             url: rejectAndEnd,
             headers: { Accept: 'application/json,text/plain' },
@@ -2044,6 +2043,7 @@ export default {
               }
             } = res;
             this.$emit('startTaskRead', res);
+            this.$emit('start-task-read', res);
             this.currentOrgName = currentOrgName;
             this.otherOrgName = otherOrgName;
             this.endFlowInfo.choiceOrgId = choiceOrgId;

package/packages/flow/src/table.vue

@@ -1,5 +1,10 @@
 <template>
-  <el-table :data="dataList" border stripe style="width: 100%;margin-top:10px">
+  <el-table
+    :data="dataList"
+    border
+    stripe
+    style="width: 100%; margin-top: 10px"
+  >
     <el-table-column
       v-for="item of tableHead"
       :key="item.id"
@@ -42,9 +47,11 @@ export default {
   methods: {
     handleClick(val) {
       this.$emit('upDateClick', val);
+      this.$emit('up-date-click', val);
     },
     delClick(val) {
       this.$emit('delClick', val);
+      this.$emit('del-click', val);
     }
   }
 };

package/packages/flow-group/src/main.vue

@@ -573,8 +573,20 @@ export default {
         let item = this.tabs[n];
         let url = null;
         let name = item.name;
-        let width = util.win.top.screen.availWidth - 10;
-        let height = util.win.top.screen.availHeight - 60;
+        let width = 0;
+        let height = 0;
+        try {
+          width = util.win.top.screen.availWidth - 10;
+          height = util.win.top.screen.availHeight - 60;
+        } catch (error) {
+          try {
+            width = util.win.parent.screen.availWidth - 10;
+            height = util.win.parent.screen.availHeight - 60;
+          } catch (error) {
+            width = util.win.screen.availWidth - 10;
+            height = util.win.screen.availHeight - 60;
+          }
+        }
         if (item.url) {
           url = this.handleUrlJoinParams(item);
         }
@@ -588,7 +600,7 @@ export default {
         }
         if (url) {
           reject();
-          util.win.top.open(
+          util.win.open(
             url,
             name,
             `width=${width}px,height=${height}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
@@ -645,8 +657,16 @@ export default {
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (util.win.top.opener) {
-        util.win.top.close();
+      } else if (util.win.opener) {
+        try {
+          util.win.top.close();
+        } catch (error) {
+          try {
+            util.win.parent.close();
+          } catch (error) {
+            util.win.postMessage({ type: 0 }, '*');
+          }
+        }
       }
       if (this.events && this.events.success) {
         this.events.success();
@@ -665,6 +685,7 @@ export default {
     },
     handleChangeData(res) {
       this.$emit('changeData', res);
+      this.$emit('change-data', res);
     }
   }
 };

package/packages/form/src/main.vue

@@ -4546,6 +4546,7 @@ export default {
               }
               this.values = util.extend({}, data, value);
               this.$emit('valueSuccess', this.values);
+              this.$emit('value-success', this.values);
               this.$emit('result', this.values);
             }
           })
@@ -4611,6 +4612,7 @@ export default {
             if (valid) {
               this.stepActive = index;
               this.$emit('stepChange', this.stepActive);
+              this.$emit('step-change', this.stepActive);
             } else {
               this.setScroll(valid, triggers, this.$refs.scrollbar);
             }
@@ -4618,6 +4620,7 @@ export default {
         } else {
           this.stepActive = index;
           this.$emit('stepChange', this.stepActive);
+          this.$emit('step-change', this.stepActive);
         }
       } else if (
         res.event === 'submit' ||
@@ -4655,6 +4658,7 @@ export default {
       } else if (res.event === 'stepPrev') {
         this.stepActive -= 1;
         this.$emit('stepChange', this.stepActive);
+        this.$emit('step-change', this.stepActive);
         this.$emit(
           'stepPrev',
           res,
@@ -4666,12 +4670,19 @@ export default {
           if (valid) {
             this.stepActive += 1;
             this.$emit('stepChange', this.stepActive);
+            this.$emit('step-change', this.stepActive);
             this.$emit(
               'stepNext',
               res,
               this.models,
               this.getNewValue(util.extend({}, this._value, this.models), res)
             );
+            this.$emit(
+              'step-next',
+              res,
+              this.models,
+              this.getNewValue(util.extend({}, this._value, this.models), res)
+            );
           } else {
             this.setScroll(valid, triggers, this.$refs.scrollbar);
           }
@@ -4737,6 +4748,7 @@ export default {
     },
     handleDataChange(res, data) {
       this.$emit('dataChange', res, data);
+      this.$emit('data-change', res, data);
     },
     handleCollapse() {},
     handleChange(a, b, c) {

package/packages/form/src/table.vue

@@ -1336,6 +1336,7 @@ export default {
     },
     handleClick(res) {
       this.$emit('btnClick', res, this.models);
+      this.$emit('btn-click', res, this.models);
     },
     handleChange(res, value, data) {
       if (res.events && res.events.change) {
@@ -1369,6 +1370,7 @@ export default {
         res.events.dataChange(res, value, data);
       } else {
         this.$emit('dataChange', res, data);
+        this.$emit('data-change', res, data);
       }
     },
     handleExclAttribute({ data, attrs }) {

package/packages/handle-user/src/main.vue

@@ -98,7 +98,15 @@ export default {
                 duration: 500,
                 onClose: () => {
                   util.removeStorage(['mainConfig', 'jump']);
-                  util.win.top.location.reload();
+                  try {
+                    util.win.top.location.reload();
+                  } catch (error) {
+                    try {
+                      util.win.parent.location.reload();
+                    } catch (error) {
+                      util.win.location.reload();
+                    }
+                  }
                 }
               });
             } else {

package/packages/handler/src/main.vue

@@ -304,37 +304,41 @@ export default {
                 if (this.onQuit && typeof this.onQuit === 'function') {
                   this.onQuit();
                 } else {
-                  const loginPage =
-                    util.getStorage('login') || util.getStorage('loginPage');
-                  if (loginPage) {
-                    let src;
-                    if (!util.startWith(loginPage, ['http', '/'], true)) {
-                      let pathname = util.win.top.location.pathname;
-                      if (pathname !== '/') {
-                        pathname = pathname.split('/');
-                        pathname.splice(pathname.length - 1);
-                        pathname = pathname.join('/');
-                        src = pathname + '/' + loginPage.replace('./', '');
+                  try {
+                    const loginPage =
+                      util.getStorage('login') || util.getStorage('loginPage');
+                    if (loginPage) {
+                      let src;
+                      if (!util.startWith(loginPage, ['http', '/'], true)) {
+                        let pathname = util.win.top.location.pathname;
+                        if (pathname !== '/') {
+                          pathname = pathname.split('/');
+                          pathname.splice(pathname.length - 1);
+                          pathname = pathname.join('/');
+                          src = pathname + '/' + loginPage.replace('./', '');
+                        } else {
+                          src = pathname + loginPage.replace('./', '');
+                        }
                       } else {
-                        src = pathname + loginPage.replace('./', '');
+                        src = loginPage;
                       }
+                      util.win.top.location.href = src;
+                    } else if (
+                      util.win.top.location.href.indexOf('main.html') > -1
+                    ) {
+                      util.win.top.location.href = './login.html';
                     } else {
-                      src = loginPage;
-                    }
-                    util.win.top.location.href = src;
-                  } else if (
-                    util.win.top.location.href.indexOf('main.html') > -1
-                  ) {
-                    util.win.top.location.href = './login.html';
-                  } else {
-                    const hash = util.win.top.location.hash;
-                    if (hash) {
-                      const len = util.win.top.location.href.indexOf(hash);
-                      util.win.top.location.href =
-                        util.win.location.href.slice(0, len) + '#/login';
-                    } else {
-                      util.win.top.location.href = '/login.html';
+                      const hash = util.win.top.location.hash;
+                      if (hash) {
+                        const len = util.win.top.location.href.indexOf(hash);
+                        util.win.top.location.href =
+                          util.win.location.href.slice(0, len) + '#/login';
+                      } else {
+                        util.win.top.location.href = '/login.html';
+                      }
                     }
+                  } catch (error) {
+                    util.win.postMessage({ type: 1 }, '*');
                   }
                 }
               }

package/packages/login/src/main.vue

@@ -183,7 +183,7 @@
               </div>
               <es-qr-code
                 :content="identifyingId"
-                v-if="active == 3"
+                v-if="active == 3 && identifyingId"
               ></es-qr-code>
               <div class="es-wx-qrcode-box" v-if="active == 9">
                 <es-wxlogin
@@ -761,7 +761,7 @@ export default {
       doAssistance: null
     };
   },
-  created() {
+  beforeCreate() {
     util.removeStorage([
       'remind',
       'ssId',
@@ -772,6 +772,8 @@ export default {
       'userName',
       'useCaseCodes'
     ]);
+  },
+  created() {
     this.code = util.getParams('code');
     if (this.code) {
       this.doWechatLogin(this.code);
@@ -914,6 +916,7 @@ export default {
           this.onDownLoadApp();
         } else {
           this.$emit('handleDownLoadApp');
+          this.$emit('handle-down-load-app');
         }
       } else {
         this.showDownLoadApp = true;
@@ -934,39 +937,37 @@ export default {
       return this.loginType.indexOf(res) > -1;
     },
     getLogin() {
-      const config = store.get('initLogin');
+      const config = util.getStorage('initLogin');
       if (config) {
         this.setConfig(config);
-      } else {
-        util
-          .ajax({ url: this.initLogin })
-          .then((res) => {
-            if (res && res.rCode === 0) {
-              store.set('initLogin', res.results);
-              util.setStorage({
-                type: this.storage,
-                key: 'initLogin',
-                value: JSON.stringify(res.results)
-              });
-              this.setConfig(res.results);
-            } else {
-              this.$message({
-                message: res.msg || '系统错误，请联系管理员！',
-                type: 'error',
-                duration: 2000
-              });
-            }
-          })
-          .catch((err) => {
-            if (err.message && err.message !== 'canceled') {
-              this.$message.error(err.message);
-            }
-          });
       }
+      util
+        .ajax({ url: this.initLogin })
+        .then((res) => {
+          if (res && res.rCode === 0) {
+            store.set('initLogin', res.results);
+            util.setStorage({
+              type: 'localStorage',
+              key: 'initLogin',
+              value: JSON.stringify(res.results)
+            });
+            this.setConfig(res.results);
+          } else {
+            this.$message({
+              message: res.msg || '系统错误，请联系管理员！',
+              type: 'error',
+              duration: 2000
+            });
+          }
+        })
+        .catch((err) => {
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
     },
     setConfig(res) {
-      const host = util.getStorage('host');
-      this.identifyingId = res.identifyingId;
+      this.identifyingId = res.identifyingId || '';
       this.getImgCode();
       let downloads = {};
       if (res.androidDownloadUrl) {
@@ -996,9 +997,12 @@ export default {
         ? res.loginBackgroundUrl.split(',')
         : null;
       this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
+      res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
       if (res.subsystemExtend && Object.keys(res.subsystemExtend).length) {
         this.icpInfo = res.subsystemExtend;
         this.forgetUrl = res.subsystemExtend.look_pass_url;
+        res.subsystemExtend.loginPage &&
+          sessionStorage.setItem('loginPage', res.subsystemExtend.loginPage);
         if (res.subsystemExtend.login_url) {
           this.actionUrl = res.subsystemExtend.login_url;
         }
@@ -1221,7 +1225,7 @@ export default {
         .then((res) => {
           this.submit = false;
           if (res.rCode == 0) {
-            sessionStorage.removeItem('extUserBindHandleId');
+            util.removeStorage('extUserBindHandleId');
             this.handleRemember();
             const results = res.results;
             this.handleResults(results);