eoss-ui 0.7.30 → 0.7.32

package/lib/tips.js

@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -666,22 +666,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4161,14 +4174,14 @@ module.exports = require("ua-parser-js");
 /***/ 12:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 
 /***/ 13:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 

package/lib/tree-group.js

@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -666,22 +666,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4161,14 +4174,14 @@ module.exports = require("ua-parser-js");
 /***/ 12:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 
 /***/ 13:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 

package/lib/tree.js

@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -666,22 +666,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4161,14 +4174,14 @@ module.exports = require("ua-parser-js");
 /***/ 12:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 
 /***/ 13:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 

package/lib/upload.js

@@ -122,8 +122,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -665,22 +665,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4438,13 +4451,13 @@ module.exports = require("ua-parser-js");
 /* 12 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 /* 13 */
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 /* 14 */

package/lib/utils/util.js

@@ -582,22 +582,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 

package/lib/wujie.js

@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -666,22 +666,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4161,14 +4174,14 @@ module.exports = require("ua-parser-js");
 /***/ 12:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 
 /***/ 13:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 

package/lib/wxlogin.js

@@ -123,8 +123,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(13).sm2;
-var lodash = __webpack_require__(12);
+var sm2 = __webpack_require__(12).sm2;
+var lodash = __webpack_require__(13);
 
 
 
@@ -666,22 +666,35 @@ var browser = function browser() {
  **/
 var busEmit = function busEmit(that, _ref3) {
   var method = _ref3.method,
-      args = _ref3.args;
+      args = _ref3.args,
+      opener = _ref3.opener;
 
+  if (opener) {
+    var source = opener.source,
+        origin = opener.origin;
+
+    source.postMessage({ method: method, query: args, args: args }, origin);
+    return;
+  }
   if (isIE) {
-    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method: method, query: args, args: args }, '*');
+      return;
     }
+    var bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit.apply(bus, [method].concat(args)) : bus.$emit(method, args));
   } else {
-    var _bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (_bus) {
-      Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method: method, query: args, args: args }, '*');
+    if (win.top !== win.self) {
+      var _bus2 = win.$wujie ? win.$wujie.bus : null;
+      if (_bus2) {
+        Array.isArray(args) ? _bus2.$emit.apply(_bus2, [method].concat(args)) : _bus2.$emit(method, args);
+      } else {
+        win.top.postMessage({ method: method, query: args, args: args }, '*');
+      }
+      return;
     }
+    var _bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    _bus && (Array.isArray(args) ? _bus.$emit.apply(_bus, [method].concat(args)) : _bus.$emit(method, args));
   }
 };
 
@@ -4161,14 +4174,14 @@ module.exports = require("ua-parser-js");
 /***/ 12:
 /***/ (function(module, exports) {
 
-module.exports = require("lodash");
+module.exports = require("sm-crypto");
 
 /***/ }),
 
 /***/ 13:
 /***/ (function(module, exports) {
 
-module.exports = require("sm-crypto");
+module.exports = require("lodash");
 
 /***/ }),
 

package/package.json

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

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

@@ -69,8 +69,8 @@ export default {
         (file.response && file.response.userName) ||
         util.getStorage('userName');
       let params = {
-        url: delAdjunct,
-        params: { userName, id: file.adjunctId || file.response.adjunctId }
+        url:util.getStorage('dochubConfig')? JSON.parse(util.getStorage('dochubConfig')).deleteDocumentUrl : delAdjunct,
+        params: { userName, id: file.adjunctId || file.response.adjunctId,ownId:this.ownId,businessId:this.ownId,bucketCode:this.code,documentId: file.adjunctId || file.response.adjunctId}
       };
       util
         .ajax(params)

package/packages/main/src/main.vue

@@ -62,7 +62,6 @@ import Simplicity from './simplicity/index.vue';
 import MainDefault from './default/index.vue';
 import util from 'eoss-ui/src/utils/util';
 import WujieVue from 'wujie-vue2';
-import { size } from 'lodash';
 export default {
   name: 'EsMain',
   inheritAttrs: false,
@@ -346,11 +345,8 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winOpen({ url, name, width, height, appCode, id, size }) {
-      if (!appCode && !id) {
-        console.error('参数错误，缺少appCode或者id');
-        return;
-      }
+    winOpen({ url, name, width = '100%', height = '100%', appCode, id, size }) {
+      id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       const openModel = util.getStorage('openModel');
       let src = url;
       if (!util.startWith(url, ['http', '/'], true)) {
@@ -406,18 +402,29 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    winClose({ url, appCode, id }) {
+    winClose({ url, appCode, id, index, refresh, jumpMenu }) {
       if (!appCode && !id) {
         console.error('参数错误，缺少appCode或者id');
         return;
       }
-      let dialog = this.dialogs.find(
-        (item) => item.url == url || item.appCode == appCode || item.id == id
-      );
-      if (dialog) {
-        this.$set(dialog, 'visible', false);
+      if (index) {
+        this.$set(this.dialogs, 'visible', false);
         this.dialogs.splice(dialog.index, 1);
+      } else {
+        let dialog = this.dialogs.find(
+          (item) => item.url == url || item.appCode == appCode || item.id == id
+        );
+
+        if (dialog) {
+          this.$set(dialog, 'visible', false);
+          this.dialogs.splice(dialog.index, 1);
+        }
       }
+      refresh && this.$refs.main.handleRefresh(refresh);
+      jumpMenu &&
+        (Array.isArray(jumpMenu)
+          ? this.$refs.main.jumpMenu(...jumpMenu)
+          : this.$refs.main.jumpMenu(jumpMenu));
     },
 
     /**
@@ -427,7 +434,6 @@ export default {
      **/
     handleMessage(e) {
       const { method, args } = e.data;
-      const { index, refresh, jumpMenu } = args;
       switch (method) {
         case 'reLogin':
           this.handleReLogin(args);
@@ -446,46 +452,16 @@ export default {
           iframe.contentWindow.postMessage(data, origin ? origin : '*');
           break;
         case 'openDialog': //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(() => {
-            this.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'closeDialog': //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu &&
-            (Array.isArray(jumpMenu)
-              ? this.$refs.main.jumpMenu(...jumpMenu)
-              : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
         case 'windowOpen': //打开弹窗
-          if (!args.appCode && !args.id) {
-            console.error('参数错误，缺少appCode或者id');
-            return;
-          }
-          args.index = this.dialogs.length;
-          args.visible = false;
-          this.dialogs.push(args);
-          this.$nextTick(() => {
-            this.$set(args, 'visible', true);
-          });
+          this.winOpen(args);
           break;
         case 'windowClose': //关闭弹窗
-          this.$set(this.dialogs[index], 'visible', false);
-          this.dialogs.splice(index, 1);
-          refresh && this.$refs.main.handleRefresh(refresh);
-          jumpMenu &&
-            (Array.isArray(jumpMenu)
-              ? this.$refs.main.jumpMenu(...jumpMenu)
-              : this.$refs.main.jumpMenu(jumpMenu));
+          this.winClose(args);
           break;
       }
     },