ecinc-cloud-yoabase 9.6.281 → 9.6.282

package/lib/ecyoabase.common.js

@@ -15411,7 +15411,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".date_table_tree[data-v-228c62f6],.dat
 
 /***/ }),
 
-/***/ 2294:
+/***/ 6448:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15425,7 +15425,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-43b1da15]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-43b1da15],.top_app_popover .item[data-v-43b1da15]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-43b1da15]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-43b1da15]{margin-top:8px}.top_app_popover .item[data-v-43b1da15]:hover{background:#eee}.top_app_popover[data-v-43b1da15]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-43b1da15]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-43b1da15]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-57c34baf]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-57c34baf],.top_app_popover .item[data-v-57c34baf]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-57c34baf]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-57c34baf]{margin-top:8px}.top_app_popover .item[data-v-57c34baf]:hover{background:#eee}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-57c34baf]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -78122,19 +78122,19 @@ var update = add("3ffdea68", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 4492:
+/***/ 8258:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(2294);
+var content = __webpack_require__(6448);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("18ff94e9", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("b1ea859a", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -229254,8 +229254,8 @@ var OfdjsView_component = normalizeComponent(
 )
 
 /* harmony default export */ var OfdjsView = (OfdjsView_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=template&id=43b1da15&scoped=true
-var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=template&id=57c34baf&scoped=true
+var appPopovervue_type_template_id_57c34baf_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229272,7 +229272,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
           return _vm.clickSpan(item);
         }
       }
-    }, [item.resName !== '运营驾驶舱' ? _c('img', {
+    }, [item.resName !== '运营驾驶舱' && item.resId !== 'diyCommonApp' ? _c('img', {
       staticStyle: {
         "width": "32px",
         "height": "32px"
@@ -229287,7 +229287,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
         "height": "32px"
       },
       attrs: {
-        "src": "/images/w-imgs/cockpit/yygljscicon.png",
+        "src": item.sysLogo || './images/w-imgs/cockpit/yygljscicon.png',
         "alt": ""
       }
     }), _c('span', {
@@ -229302,7 +229302,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
     }]
   }, [_vm._v("暂无数据")])]], 2);
 };
-var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
+var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
 /* harmony default export */ var appPopovervue_type_script_lang_js = ({
@@ -229398,7 +229398,23 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
         }
       }
       if (sys.indexUrl && (sys.indexUrl.indexOf('http://') > -1 || sys.indexUrl.indexOf('https://') > -1)) {
-        window.open(sys.indexUrl);
+        var indexUrl = sys.indexUrl;
+        this.$http({
+          method: 'GET',
+          url: 'base/user/getSessionId'
+        }).then(function (res) {
+          if (res.code === 'success') {
+            var tSessionId = res.body.tSessionId;
+            if (indexUrl.indexOf('?') > -1) {
+              indexUrl = indexUrl += '&tSessionId=' + tSessionId;
+            } else {
+              indexUrl = indexUrl += '?tSessionId=' + tSessionId;
+            }
+            window.open(indexUrl);
+          } else {
+            window.open(indexUrl);
+          }
+        });
         return;
       }
       if (this.isSetApp) return;
@@ -229474,9 +229490,9 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
  /* harmony default export */ var popover_appPopovervue_type_script_lang_js = (appPopovervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=43b1da15&prod&scoped=true&lang=scss
-var appPopovervue_type_style_index_0_id_43b1da15_prod_scoped_true_lang_scss = __webpack_require__(4492);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=43b1da15&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
+var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __webpack_require__(8258);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue
 
@@ -229489,11 +229505,11 @@ var appPopovervue_type_style_index_0_id_43b1da15_prod_scoped_true_lang_scss = __
 
 var appPopover_component = normalizeComponent(
   popover_appPopovervue_type_script_lang_js,
-  appPopovervue_type_template_id_43b1da15_scoped_true_render,
-  appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns,
+  appPopovervue_type_template_id_57c34baf_scoped_true_render,
+  appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns,
   false,
   null,
-  "43b1da15",
+  "57c34baf",
   null
   
 )

package/lib/ecyoabase.umd.js

@@ -15421,7 +15421,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".date_table_tree[data-v-228c62f6],.dat
 
 /***/ }),
 
-/***/ 8198:
+/***/ 2352:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15435,7 +15435,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-43b1da15]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-43b1da15],.top_app_popover .item[data-v-43b1da15]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-43b1da15]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-43b1da15]{margin-top:8px}.top_app_popover .item[data-v-43b1da15]:hover{background:#eee}.top_app_popover[data-v-43b1da15]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-43b1da15]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-43b1da15]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".top_app_popover[data-v-57c34baf]{width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:distribute;justify-content:space-around;overflow:auto}.top_app_popover[data-v-57c34baf],.top_app_popover .item[data-v-57c34baf]{display:-webkit-box;display:-ms-flexbox;display:flex}.top_app_popover .item[data-v-57c34baf]{height:80px;background:#f1f3f8;font-size:var(--portalFontSize13);color:#333;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin:3px 0;cursor:pointer}.top_app_popover .item .spanName[data-v-57c34baf]{margin-top:8px}.top_app_popover .item[data-v-57c34baf]:hover{background:#eee}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar{background-color:#fff;width:6px}.top_app_popover[data-v-57c34baf]::-webkit-scrollbar-thumb{border-radius:6px}.top_app_popover[data-v-57c34baf]:hover::-webkit-scrollbar-thumb{background-color:#d2d4da}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -78132,19 +78132,19 @@ var update = add("e308a668", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 3866:
+/***/ 396:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8198);
+var content = __webpack_require__(2352);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("354d922e", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("73645f33", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -229264,8 +229264,8 @@ var OfdjsView_component = normalizeComponent(
 )
 
 /* harmony default export */ var OfdjsView = (OfdjsView_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=template&id=43b1da15&scoped=true
-var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=template&id=57c34baf&scoped=true
+var appPopovervue_type_template_id_57c34baf_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229282,7 +229282,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
           return _vm.clickSpan(item);
         }
       }
-    }, [item.resName !== '运营驾驶舱' ? _c('img', {
+    }, [item.resName !== '运营驾驶舱' && item.resId !== 'diyCommonApp' ? _c('img', {
       staticStyle: {
         "width": "32px",
         "height": "32px"
@@ -229297,7 +229297,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
         "height": "32px"
       },
       attrs: {
-        "src": "/images/w-imgs/cockpit/yygljscicon.png",
+        "src": item.sysLogo || './images/w-imgs/cockpit/yygljscicon.png',
         "alt": ""
       }
     }), _c('span', {
@@ -229312,7 +229312,7 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_render = function render
     }]
   }, [_vm._v("暂无数据")])]], 2);
 };
-var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
+var appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
 /* harmony default export */ var appPopovervue_type_script_lang_js = ({
@@ -229408,7 +229408,23 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
         }
       }
       if (sys.indexUrl && (sys.indexUrl.indexOf('http://') > -1 || sys.indexUrl.indexOf('https://') > -1)) {
-        window.open(sys.indexUrl);
+        var indexUrl = sys.indexUrl;
+        this.$http({
+          method: 'GET',
+          url: 'base/user/getSessionId'
+        }).then(function (res) {
+          if (res.code === 'success') {
+            var tSessionId = res.body.tSessionId;
+            if (indexUrl.indexOf('?') > -1) {
+              indexUrl = indexUrl += '&tSessionId=' + tSessionId;
+            } else {
+              indexUrl = indexUrl += '?tSessionId=' + tSessionId;
+            }
+            window.open(indexUrl);
+          } else {
+            window.open(indexUrl);
+          }
+        });
         return;
       }
       if (this.isSetApp) return;
@@ -229484,9 +229500,9 @@ var appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=script&lang=js
  /* harmony default export */ var popover_appPopovervue_type_script_lang_js = (appPopovervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=43b1da15&prod&scoped=true&lang=scss
-var appPopovervue_type_style_index_0_id_43b1da15_prod_scoped_true_lang_scss = __webpack_require__(3866);
-;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=43b1da15&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
+var appPopovervue_type_style_index_0_id_57c34baf_prod_scoped_true_lang_scss = __webpack_require__(396);
+;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue?vue&type=style&index=0&id=57c34baf&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecyoa/yoabase/src/common/components/popover/appPopover.vue
 
@@ -229499,11 +229515,11 @@ var appPopovervue_type_style_index_0_id_43b1da15_prod_scoped_true_lang_scss = __
 
 var appPopover_component = normalizeComponent(
   popover_appPopovervue_type_script_lang_js,
-  appPopovervue_type_template_id_43b1da15_scoped_true_render,
-  appPopovervue_type_template_id_43b1da15_scoped_true_staticRenderFns,
+  appPopovervue_type_template_id_57c34baf_scoped_true_render,
+  appPopovervue_type_template_id_57c34baf_scoped_true_staticRenderFns,
   false,
   null,
-  "43b1da15",
+  "57c34baf",
   null
   
 )