eoss-ui 0.4.98 → 0.4.99

package/lib/wujie.js

@@ -1939,29 +1939,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',

package/lib/wxlogin.js

@@ -1939,29 +1939,29 @@ var isLogined = function isLogined(_ref8) {
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
 
-  var logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        var pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      var pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  var token = getStorage('token') || getStorage('Authorization');
+  var logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
       ajax({
         method: 'post',

package/package.json

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

package/packages/flow/src/main.vue

@@ -514,7 +514,9 @@
                   <div class="btn" @click="taskReadBtn">分阅</div>
                 </el-dropdown-item>
                 <el-dropdown-item v-if="rejectObj.fun">
-                  <div style="color: red" @click="rejectBtn">驳回</div>
+                  <div style="color: red" @click="rejectBtn">
+                    {{ rejectObj.value }}
+                  </div>
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -739,6 +741,7 @@ export default {
       flowDisabled: false,
       activeNames: '',
       isEndUserTask: true,
+      isForceDisplayDefaultOptionForPrefix: false,
       selectUserList: [],
       selectNextCurrentOrgObjList: [],
       flowMultiple: true,
@@ -2017,6 +2020,16 @@ export default {
               } else if (this.nodeInfos.length > 0) {
                 this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
               }
+              this.isForceDisplayDefaultOptionForPrefix =
+                nodeInfoMap.nodeExtAttr.isForceDisplayDefaultOptionForPrefix ==
+                1;
+              if (nodeInfoMap.nodeExtAttr.submitText) {
+                this.btnList.map((x) => {
+                  if (x.event === 'sub') {
+                    x.text = nodeInfoMap.nodeExtAttr.submitText;
+                  }
+                });
+              }
             }
             this.choiceOrgId = choiceOrgId;
             this.choiceDeptId = choiceDeptId;
@@ -2081,7 +2094,7 @@ export default {
             if (!this.isOpinionRequired) {
               this.isOpinionRequired = 0;
             }
-            opinion && (this.value = opinion);
+            // opinion && (this.value = opinion);
             this.nextNode.notificationMsg = defaultNotificationMessage;
             this.moreList = [];
             if (taskButtonList && taskButtonList.length != 0) {
@@ -2382,7 +2395,11 @@ export default {
           let params = {
             ...this.nextNode,
             pendingId: this.pendingId,
-            opinion: this.value,
+            opinion:
+              this.isForceDisplayDefaultOptionForPrefix &&
+              !this.value.startsWith(this.nodeDefaultSubmitOpinion)
+                ? this.nodeDefaultSubmitOpinion + this.value
+                : this.value,
             userId: util.getStorage('userId'),
             nextUserId: this.multiple
               ? nextUserId.join(',')

package/packages/main/src/main.vue

@@ -622,12 +622,19 @@ export default {
     };
   },
   created() {
+    let params = util.getParams() || {};
+    if (Object.prototype.hasOwnProperty.call(params, 'history')) {
+      this.history =
+        params.history == true ||
+        params.history == 'true' ||
+        params.history == 1;
+    }
     this.homePage =
       typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
-    this.isHeader = util.getParams('header');
+    this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
-    this.isLogin();
+    this.isLogin(params);
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -642,8 +649,7 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
-    async isLogin() {
-      const query = util.getParams();
+    async isLogin(query) {
       const token =
         util.getStorage('token') || util.getStorage('Authorization');
 
@@ -663,6 +669,7 @@ export default {
       }
       if (
         !token &&
+        query &&
         Object.prototype.hasOwnProperty.call(query, 'serverId') &&
         Object.prototype.hasOwnProperty.call(query, 'authType')
       ) {
@@ -1369,7 +1376,11 @@ export default {
           this.setTips(item);
         });
       } else {
-        if (Object.prototype.hasOwnProperty.call(obj, 'tips') && obj.tips) {
+        if (
+          obj &&
+          Object.prototype.hasOwnProperty.call(obj, 'tips') &&
+          obj.tips
+        ) {
           this.$set(obj, 'tips', false);
           delete obj.tips;
         }
@@ -1694,7 +1705,7 @@ export default {
         if (res.path !== '/' && pathname == path) {
           return pathname;
         }
-        if (Object.prototype.hasOwnProperty.call(res, 'children')) {
+        if (res && Object.prototype.hasOwnProperty.call(res, 'children')) {
           let path = this.hasRouter(res.children, url);
           if (path) {
             return path;

package/packages/theme-chalk/gulpfile.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const { series, src, dest } = require('gulp');
+const sass = require('gulp-sass');
+const autoprefixer = require('gulp-autoprefixer');
+const cssmin = require('gulp-cssmin');
+
+function compile() {
+  return src('./src/*.scss')
+    .pipe(sass.sync())
+    .pipe(autoprefixer({
+      overrideBrowserslist: ['ie > 9', 'last 2 versions'],
+      cascade: false
+    }))
+    .pipe(cssmin())
+    .pipe(dest('./lib'));
+}
+
+function copyfont() {
+  return src('./src/fonts/**')
+    .pipe(cssmin())
+    .pipe(dest('./lib/fonts'));
+}
+
+exports.build = series(compile, copyfont);

package/src/index.js

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

package/src/utils/util.js

@@ -1875,29 +1875,29 @@ const isLogined = function ({
   loginPage,
   redirect
 }) {
-  const logined = getStorage('logined');
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
-  // eslint-disable-next-line eqeqeq
-  if (logined || cookie == true || cookie == 1) {
-    if (loginPage) {
-      sessionStorage.setItem('loginPage', loginPage);
-      if (!startWith(loginPage, ['http', '/'], true)) {
-        let pathname = win.top.location.pathname;
-        if (pathname !== '/') {
-          pathname = pathname.split('/');
-          pathname.splice(pathname.length - 1);
-          pathname = pathname.join('/');
-          loginPage = pathname + '/' + loginPage.replace('./', '');
-        } else {
-          loginPage = pathname + loginPage.replace('./', '');
-        }
+  if (loginPage) {
+    sessionStorage.setItem('loginPage', loginPage);
+    if (!startWith(loginPage, ['http', '/'], true)) {
+      let pathname = win.top.location.pathname;
+      if (pathname !== '/') {
+        pathname = pathname.split('/');
+        pathname.splice(pathname.length - 1);
+        pathname = pathname.join('/');
+        loginPage = pathname + '/' + loginPage.replace('./', '');
+      } else {
+        loginPage = pathname + loginPage.replace('./', '');
       }
     }
-    next();
+  }
+  const token = getStorage('token') || getStorage('Authorization');
+  const logined = getStorage('logined');
+  // eslint-disable-next-line eqeqeq
+  if (token || logined || cookie == true || cookie == 1) {
+    next && next();
   } else {
-    const token = getStorage('token') || getStorage('Authorization');
     if (
       !token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') &&
       Object.prototype.hasOwnProperty.call(to.query, 'authType')