eoss-ui 0.4.94 → 0.4.96

package/lib/flow.js

@@ -724,7 +724,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -732,17 +732,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1942,20 +1962,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1983,6 +1989,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {
@@ -3633,7 +3640,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=1742774e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=6538259e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4381,7 +4388,8 @@ var render = function () {
                                             1
                                           )
                                         : _vm._e(),
-                                      _vm.isMainSubProcess
+                                      _vm.isMainSubProcess &&
+                                      _vm.isNodeShowProcess
                                         ? _c(
                                             "el-form-item",
                                             {
@@ -5258,7 +5266,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=1742774e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6538259e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -12763,6 +12771,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       isHideCurrentOrg: false, //是否隐藏本单位(承办)
       isHideOtherOrg: false, //是否隐藏外单位(承办)
       isMainSubProcess: false, // 判断是否子-主流程
+      isNodeShowProcess: false, //是否展示主办
       isNextUser: false,
       isShowNode: false,
       nextNodeList: [],
@@ -12893,7 +12902,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
   },
   methods: {
     getsubProcessColumns: function getsubProcessColumns() {
-      if (!this.isMainSubProcess) return [];
+      if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       var data = [];
       var obj = { name: '[部门员工]-' };
       if (this.nextCurrentOrgObjSelect.length > 0) {
@@ -13570,6 +13579,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             _this12.nodeType = data.nodeExtAttr.nodeType;
             //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
             if (_this12.nodeType === 1 || _this12.nodeType === 2) {
+              _this12.isMainSubProcess === true ? _this12.isNodeShowProcess = true : _this12.isNodeShowProcess = false;
               _this12.isMainSubProcess === true ? _this12.isMainSubProcess = true : _this12.isMainSubProcess = false;
               _this12.isNextUser = false;
               _this12.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
@@ -13577,6 +13587,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             } else {
               _this12.isHideCurrentOrg = false;
               _this12.isHideOtherOrg = false;
+              _this12.isNodeShowProcess = false;
               _this12.isMainSubProcess = false;
               _this12.isNextUser = true;
               // this.isMainSubProcess === true
@@ -13656,6 +13667,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
+        this.isNodeShowProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;

package/lib/form.js

@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {

package/lib/handle-user.js

@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {

package/lib/handler.js

@@ -725,7 +725,7 @@ var debounce = function debounce(callback, delay) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - url地址
- * @param {String} [key] - 参数名
+ * @param {String,Array} [key] - 参数名
  **/
 var delUrlParam = function delUrlParam(_ref2) {
   var url = _ref2.url,
@@ -733,17 +733,37 @@ var delUrlParam = function delUrlParam(_ref2) {
 
   var src = url ? decodeURI(url) : decodeURI(win.top.location.href);
   var param = getParams({ url: src });
-  if (param && param.hasOwnProperty(key)) {
-    var reg = key + '=' + param[key];
-    if (Object.keys(param).length > 1) {
-      if (src.indexOf(reg + '&') > -1) {
-        src = src.replace(reg + '&', '');
-      }
-      if (src.indexOf('&' + reg) > -1) {
-        src = src.replace('&' + reg, '');
-      }
+  if (param && key.length) {
+    if (Array.isArray(key)) {
+      key.forEach(function (item) {
+        if (param.hasOwnProperty(item)) {
+          var reg = item + '=' + param[item];
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          } else if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          } else {
+            src = src.replace(reg, '');
+          }
+        }
+        if (Object.keys(param).length === key.length) {
+          src = src.replace('?', '');
+        }
+      });
     } else {
-      src = src.replace('?' + reg, '');
+      if (param.hasOwnProperty(key)) {
+        var reg = key + '=' + param[key];
+        if (Object.keys(param).length > 1) {
+          if (src.indexOf(reg + '&') > -1) {
+            src = src.replace(reg + '&', '');
+          }
+          if (src.indexOf('&' + reg) > -1) {
+            src = src.replace('&' + reg, '');
+          }
+        } else {
+          src = src.replace('?' + reg, '');
+        }
+      }
     }
   }
   return src;
@@ -1943,20 +1963,6 @@ var isLogined = function isLogined(_ref8) {
   } else {
     var token = getStorage('token') || getStorage('Authorization');
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
-      var url = win.top.location.href;
-      if (to.query.openType) {
-        switch (to.query.openType) {
-          case 'self':
-            url = win.location.href;
-            break;
-          case 'blank':
-            url = win.open(url);
-            break;
-          case 'parent':
-            url = win.parent.location.href;
-            break;
-        }
-      }
       ajax({
         method: 'post',
         url: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* authCenter */ "b"],
@@ -1984,6 +1990,7 @@ var isLogined = function isLogined(_ref8) {
             case 2:
               break;
             case 3:
+              var url = win.top.location.href;
               var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
               if (to.query.openType) {
                 switch (to.query.openType) {