eoss-ui 0.7.31 → 0.7.33

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.31",
+  "version": "0.7.33",
   "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,
@@ -347,7 +346,7 @@ export default {
      * @date 2024年9月7日
      **/
     winOpen({ url, name, width = '100%', height = '100%', appCode, id, size }) {
-      id = id ? id : appCode ?undefined: 'iframe' + this.dialogs.length;
+      id = id ? id : appCode ? undefined : 'iframe' + this.dialogs.length;
       const openModel = util.getStorage('openModel');
       let src = url;
       if (!util.startWith(url, ['http', '/'], true)) {
@@ -477,7 +476,10 @@ export default {
         ? iframe
         : document.getElementById(data.appCode || data.id);
       const origin = new URL(iframe.src).origin;
-      iframe.contentWindow.postMessage(data, origin);
+      iframe.contentWindow.postMessage(
+        { ...data, method: 'windowOpen' },
+        origin
+      );
     },
 
     /**

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

@@ -277,8 +277,8 @@
             frameborder="0"
             width="100%"
             height="100%"
-            :id="activeName == item.id ? iframeId : ''"
-            :name="activeName == item.id ? iframeId : ''"
+            :id="activeName == item.id ? iframeId : item.id || item.appCode"
+            :name="activeName == item.id ? iframeId : item.id || item.appCode"
             :onload="handleLoadIframe(item)"
             :src="item.url"
           ></iframe>
@@ -379,6 +379,7 @@ import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
 const isIE = /MSIE|Trident/.test(navigator.userAgent);
 const systemMode = util.win.systemMode || 'default';
+import WujieVue from 'wujie-vue2';
 let events = [
   (tabs, index, that) => {
     let tab = tabs[index];
@@ -1804,7 +1805,7 @@ export default {
      **/
     handleRefresh(arg) {
       let i =
-        arg && arg != true
+        arg && arg != true && arg !== 'pageData'
           ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
           : util.indexOfObj(this.tabs, this.activeName, 'id');
       let tab = this.tabs[i];
@@ -1813,15 +1814,29 @@ export default {
       } else {
         let tab = this.tabs[i];
         if (tab.method === 'iframe') {
-          this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          if (arg && arg === 'pageData') {
+            const iframe = document.getElementById(tab.id || tab.appCode);
+            iframe.contentWindow.postMessage({ method: 'refresh' }, tab.url);
+          } else {
+            this.$set(this.tabs[i], 'url', util.handlerUrl(tab.url));
+          }
         }
         if (tab.method === 'wujie' && tab.appCode) {
-          window.document
-            .querySelector(`iframe[name=${tab.appCode}]`)
-            .contentWindow.location.reload(true);
+          if (arg && arg === 'pageData') {
+            WujieVue.$emit('refresh', tab);
+          } else {
+            window.document
+              .querySelector(`iframe[name=${tab.appCode}]`)
+              .contentWindow.location.reload(true);
+          }
         }
         if (tab.method === 'router') {
-          this.$set(this.tabs[i], 'keys', util.uuid());
+          if (arg && arg === 'pageData') {
+            const bus = this.bus || this.$root.Bus;
+            bus.$emit('refresh', tab);
+          } else {
+            this.$set(this.tabs[i], 'keys', util.uuid());
+          }
         }
       }
     },

package/src/index.js

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

package/src/utils/util.js

@@ -557,21 +557,32 @@ const browser = function () {
  * @author huangbo
  * @date 2022年5月7日
  **/
-const busEmit = function (that, { method, args }) {
+const busEmit = function (that, { method, args, opener }) {
+  if (opener) {
+    const { source, origin } = opener;
+    source.postMessage({ method, query: args, args }, origin);
+    return;
+  }
   if (isIE) {
-    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method, query: args, args }, '*');
+    if (win.top !== win.self) {
+      win.top.postMessage({ method, query: args, args }, '*');
+      return;
     }
+    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args));
   } else {
-    const bus = win.$wujie ? win.$wujie.bus : that ? that.bus || that.$root.Bus || that.$root.$bus : null;
-    if (bus) {
-      Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
-    } else {
-      win.parent.postMessage({ method, query: args, args }, '*');
+    if (win.top !== win.self) {
+      const bus = win.$wujie ? win.$wujie.bus : null;
+      if (bus) {
+        Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args);
+
+      } else {
+        win.top.postMessage({ method, query: args, args }, '*');
+      }
+      return;
     }
+    const bus = that ? that.bus || that.$root.Bus || that.$root.$bus : null;
+    bus && (Array.isArray(args) ? bus.$emit(method, ...args) : bus.$emit(method, args));
   }
 };