eoss-ui 0.7.21 → 0.7.23

package/lib/utils/util.js

@@ -159,16 +159,17 @@ var ajax = function ajax(_ref) {
     http.interceptors.response.use(function (response) {
       // delPendingRequest(response.config);
       loading && loading.close();
-      if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        setStorage({
+      if (response.headers.authorization) {
+        response.headers.authorization !== getStorage('token') && setStorage({
+
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
       }
       var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-      if (ssId && ssId !== getStorage('ssId')) {
-        setStorage({
+      if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
           key: 'ssId',
           value: ssId
         });

package/lib/wujie.js

@@ -243,16 +243,17 @@ var ajax = function ajax(_ref) {
     http.interceptors.response.use(function (response) {
       // delPendingRequest(response.config);
       loading && loading.close();
-      if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        setStorage({
+      if (response.headers.authorization) {
+        response.headers.authorization !== getStorage('token') && setStorage({
+
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
       }
       var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-      if (ssId && ssId !== getStorage('ssId')) {
-        setStorage({
+      if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
           key: 'ssId',
           value: ssId
         });

package/lib/wxlogin.js

@@ -243,16 +243,17 @@ var ajax = function ajax(_ref) {
     http.interceptors.response.use(function (response) {
       // delPendingRequest(response.config);
       loading && loading.close();
-      if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-        setStorage({
+      if (response.headers.authorization) {
+        response.headers.authorization !== getStorage('token') && setStorage({
+
           key: ['token', 'Authorization'],
           value: response.headers.authorization
         });
       }
       var ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-      if (ssId && ssId !== getStorage('ssId')) {
-        setStorage({
+      if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
           key: 'ssId',
           value: ssId
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.7.21",
+  "version": "0.7.23",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/processForm.vue

@@ -144,6 +144,7 @@
             :radioList="radioList"
             :multiple="multiple"
             :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
+            :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
             :options="options"
             :presetEdit="presetEdit"
             :mix="multiple"
@@ -483,6 +484,7 @@ export default {
     return {
       loading: false,
       isCustomUser: 0,
+      isCurrentNodeForbiddenChangeCandidate:0,
       allLoading: null,
       selectUser: false,
       multiple: false,
@@ -1050,6 +1052,8 @@ export default {
             this.allLoading.close();
           }
           if (status === 'success') {
+            this.isCurrentNodeForbiddenChangeCandidate =
+              nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             this.nextNode.userInfo = nextUserList;
             this.countersignaturetypeCode = countersignaturetypeCode;
             this.nextNode.countersignaturetypeText = countersignaturetypeText;

package/packages/login/src/main.vue

@@ -1766,9 +1766,27 @@ export default {
         .then((res) => {
           if (res.rCode === 0) {
             const results = res.results;
-            if (results.statusCode === 0) {
+            if (results.statusCode === 0 || results.statusCode === 2) {
+              // statusCode为2时 代表密码过期，也应执行handleResults
               clearTimeout(this.interval);
-              this.handleResults(results, 3);
+              if (results.statusCode === 2) {
+                this.$alert(
+                  results.msg
+                    ? results.msg
+                    : '您的初始密码已过期，请及时修改！',
+                  '提示',
+                  {
+                    confirmButtonText: '确定',
+                    type: 'warning'
+                  }
+                )
+                  .then(() => {
+                    this.handleResults(results, 3);
+                  })
+                  .catch((e) => {});
+              } else {
+                this.handleResults(results, 3);
+              }
             } else {
               this.loginInfo(true);
             }

package/packages/main/src/simplicity/index.vue

@@ -2076,11 +2076,11 @@ export default {
         }
         if (close) {
           if (close === old) {
-            this.tabs.splice(n, 0);
+            this.tabs.splice(n, 1);
           } else {
             let d = util.indexOfObj(this.tabs, close, 'id,code,appCode');
             if (d > -1) {
-              this.tabs.splice(d, 0);
+              this.tabs.splice(d, 1);
             }
           }
         }

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.7.21',
+  version: '0.7.23',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -125,18 +125,19 @@ const ajax = function ({
         // delPendingRequest(response.config);
         loading && loading.close();
         if (
-          response.headers.authorization &&
-          response.headers.authorization !== getStorage('token')
+          response.headers.authorization
+
         ) {
-          setStorage({
+          response.headers.authorization !== getStorage('token') && setStorage({
+
             key: ['token', 'Authorization'],
             value: response.headers.authorization
           });
         }
         const ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
 
-        if (ssId && ssId !== getStorage('ssId')) {
-          setStorage({
+        if (ssId) {
+        ssId !== getStorage('ssId') && setStorage({
             key: 'ssId',
             value: ssId
           });