eoss-ui 0.5.44 → 0.5.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/lib/button-group.js +16 -0
  2. package/lib/button.js +22 -9
  3. package/lib/checkbox-group.js +16 -0
  4. package/lib/data-table-form.js +16 -0
  5. package/lib/data-table.js +21 -6
  6. package/lib/date-picker.js +16 -0
  7. package/lib/dialog.js +24 -11
  8. package/lib/eoss-ui.common.js +125 -115
  9. package/lib/flow-group.js +30 -17
  10. package/lib/flow-list.js +16 -0
  11. package/lib/flow.js +16 -0
  12. package/lib/form.js +16 -0
  13. package/lib/handle-user.js +23 -8
  14. package/lib/handler.js +22 -3
  15. package/lib/index.js +1 -1
  16. package/lib/input-number.js +16 -0
  17. package/lib/input.js +16 -0
  18. package/lib/login.js +16 -0
  19. package/lib/main.js +27 -4
  20. package/lib/nav.js +16 -0
  21. package/lib/page.js +16 -0
  22. package/lib/player.js +16 -0
  23. package/lib/qr-code.js +16 -0
  24. package/lib/radio-group.js +16 -0
  25. package/lib/retrial-auth.js +20 -6
  26. package/lib/select-ganged.js +16 -0
  27. package/lib/select.js +16 -0
  28. package/lib/selector-panel.js +16 -0
  29. package/lib/selector.js +16 -0
  30. package/lib/sizer.js +16 -0
  31. package/lib/steps.js +16 -0
  32. package/lib/switch.js +16 -0
  33. package/lib/table-form.js +16 -0
  34. package/lib/tabs.js +16 -0
  35. package/lib/theme-chalk/index.css +1 -1
  36. package/lib/theme-chalk/toolbar.css +1 -1
  37. package/lib/tips.js +16 -0
  38. package/lib/toolbar.js +7 -1
  39. package/lib/tree-group.js +16 -0
  40. package/lib/tree.js +16 -0
  41. package/lib/upload.js +22 -15
  42. package/lib/utils/util.js +16 -0
  43. package/lib/wujie.js +16 -0
  44. package/lib/wxlogin.js +16 -0
  45. package/package.json +2 -2
  46. package/packages/button/src/main.vue +6 -9
  47. package/packages/data-table/src/main.vue +0 -1
  48. package/packages/dialog/src/main.vue +6 -9
  49. package/packages/flow-group/src/main.vue +12 -15
  50. package/packages/handle-user/src/main.vue +5 -6
  51. package/packages/handler/src/main.vue +4 -1
  52. package/packages/main/src/main.vue +9 -2
  53. package/packages/retrial-auth/src/main.vue +2 -4
  54. package/packages/theme-chalk/lib/index.css +1 -1
  55. package/packages/theme-chalk/lib/toolbar.css +1 -1
  56. package/packages/theme-chalk/src/toolbar.scss +3 -0
  57. package/packages/toolbar/src/main.vue +10 -1
  58. package/packages/upload/src/main.vue +1 -10
  59. package/src/index.js +1 -1
  60. package/src/utils/util.js +16 -0
@@ -1 +1 @@
1
- @charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
1
+ @charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
package/lib/tips.js CHANGED
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
1250
1250
  return datetimeObj.getHours();
1251
1251
  };
1252
1252
 
1253
+ /**
1254
+ * getMyWinTop
1255
+ * @desc 获取同域的top窗口
1256
+ * @param {object} wind - window对象
1257
+ **/
1258
+ var getMyWinTop = function getMyWinTop(wind) {
1259
+ wind = wind ? wind : win;
1260
+ try {
1261
+ wind.parent.document;
1262
+ return getMyWinTop(wind.parent);
1263
+ } catch (error) {
1264
+ return wind;
1265
+ }
1266
+ };
1267
+
1253
1268
  /**
1254
1269
  * getWeekNumber
1255
1270
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
3003
3018
  getCurrentDate: getCurrentDate,
3004
3019
  getCurrentDateTime: getCurrentDateTime,
3005
3020
  getHour: getHour,
3021
+ getMyWinTop: getMyWinTop,
3006
3022
  getWeekNumber: getWeekNumber,
3007
3023
  getLength: getLength,
3008
3024
  getMainConfig: getMainConfig,
package/lib/toolbar.js CHANGED
@@ -463,7 +463,13 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
463
463
  _this2.show = !_this2.show;
464
464
  }
465
465
  }
466
- }, '高级搜索'));
466
+ }, ['高级搜索', h('i', {
467
+ class: {
468
+ 'el-icon-arrow-down': !_this2.show,
469
+ 'el-icon-arrow-up': _this2.show,
470
+ 'es-advanced-icon': 1
471
+ }
472
+ })]));
467
473
  filter = h('transition', {
468
474
  props: {
469
475
  name: 'el-zoom-in-top'
package/lib/tree-group.js CHANGED
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
1250
1250
  return datetimeObj.getHours();
1251
1251
  };
1252
1252
 
1253
+ /**
1254
+ * getMyWinTop
1255
+ * @desc 获取同域的top窗口
1256
+ * @param {object} wind - window对象
1257
+ **/
1258
+ var getMyWinTop = function getMyWinTop(wind) {
1259
+ wind = wind ? wind : win;
1260
+ try {
1261
+ wind.parent.document;
1262
+ return getMyWinTop(wind.parent);
1263
+ } catch (error) {
1264
+ return wind;
1265
+ }
1266
+ };
1267
+
1253
1268
  /**
1254
1269
  * getWeekNumber
1255
1270
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
3003
3018
  getCurrentDate: getCurrentDate,
3004
3019
  getCurrentDateTime: getCurrentDateTime,
3005
3020
  getHour: getHour,
3021
+ getMyWinTop: getMyWinTop,
3006
3022
  getWeekNumber: getWeekNumber,
3007
3023
  getLength: getLength,
3008
3024
  getMainConfig: getMainConfig,
package/lib/tree.js CHANGED
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
1250
1250
  return datetimeObj.getHours();
1251
1251
  };
1252
1252
 
1253
+ /**
1254
+ * getMyWinTop
1255
+ * @desc 获取同域的top窗口
1256
+ * @param {object} wind - window对象
1257
+ **/
1258
+ var getMyWinTop = function getMyWinTop(wind) {
1259
+ wind = wind ? wind : win;
1260
+ try {
1261
+ wind.parent.document;
1262
+ return getMyWinTop(wind.parent);
1263
+ } catch (error) {
1264
+ return wind;
1265
+ }
1266
+ };
1267
+
1253
1268
  /**
1254
1269
  * getWeekNumber
1255
1270
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
3003
3018
  getCurrentDate: getCurrentDate,
3004
3019
  getCurrentDateTime: getCurrentDateTime,
3005
3020
  getHour: getHour,
3021
+ getMyWinTop: getMyWinTop,
3006
3022
  getWeekNumber: getWeekNumber,
3007
3023
  getLength: getLength,
3008
3024
  getMainConfig: getMainConfig,
package/lib/upload.js CHANGED
@@ -1249,6 +1249,21 @@ var getHour = function getHour(datetime) {
1249
1249
  return datetimeObj.getHours();
1250
1250
  };
1251
1251
 
1252
+ /**
1253
+ * getMyWinTop
1254
+ * @desc 获取同域的top窗口
1255
+ * @param {object} wind - window对象
1256
+ **/
1257
+ var getMyWinTop = function getMyWinTop(wind) {
1258
+ wind = wind ? wind : win;
1259
+ try {
1260
+ wind.parent.document;
1261
+ return getMyWinTop(wind.parent);
1262
+ } catch (error) {
1263
+ return wind;
1264
+ }
1265
+ };
1266
+
1252
1267
  /**
1253
1268
  * getWeekNumber
1254
1269
  * @desc 当年第几周
@@ -3002,6 +3017,7 @@ var watermark = function watermark(option) {
3002
3017
  getCurrentDate: getCurrentDate,
3003
3018
  getCurrentDateTime: getCurrentDateTime,
3004
3019
  getHour: getHour,
3020
+ getMyWinTop: getMyWinTop,
3005
3021
  getWeekNumber: getWeekNumber,
3006
3022
  getLength: getLength,
3007
3023
  getMainConfig: getMainConfig,
@@ -3747,8 +3763,8 @@ module.exports = require("js-base64");
3747
3763
  // ESM COMPAT FLAG
3748
3764
  __webpack_require__.r(__webpack_exports__);
3749
3765
 
3750
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=4eac4348&
3751
- var mainvue_type_template_id_4eac4348_render = function () {
3766
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=3d54363f&
3767
+ var mainvue_type_template_id_3d54363f_render = function () {
3752
3768
  var _vm = this
3753
3769
  var _h = _vm.$createElement
3754
3770
  var _c = _vm._self._c || _h
@@ -4128,10 +4144,10 @@ var mainvue_type_template_id_4eac4348_render = function () {
4128
4144
  : _vm._e()
4129
4145
  }
4130
4146
  var staticRenderFns = []
4131
- mainvue_type_template_id_4eac4348_render._withStripped = true
4147
+ mainvue_type_template_id_3d54363f_render._withStripped = true
4132
4148
 
4133
4149
 
4134
- // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=4eac4348&
4150
+ // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=3d54363f&
4135
4151
 
4136
4152
  // EXTERNAL MODULE: ./src/config/api.js
4137
4153
  var api = __webpack_require__(1);
@@ -4892,16 +4908,7 @@ var _props;
4892
4908
  this.$refs.upload.submit();
4893
4909
  },
4894
4910
  openKkfileview: function openKkfileview(file) {
4895
- var host = '';
4896
- try {
4897
- host = util["a" /* default */].win.top.location.origin;
4898
- } catch (error) {
4899
- try {
4900
- host = util["a" /* default */].win.parent.location.origin;
4901
- } catch (error) {
4902
- host = util["a" /* default */].win.location.origin;
4903
- }
4904
- }
4911
+ var host = util["a" /* default */].win.location.origin;
4905
4912
  if (this.host) {
4906
4913
  if (util["a" /* default */].startWith(this.host, 'http')) {
4907
4914
  host = this.host;
@@ -5238,7 +5245,7 @@ var componentNormalizer = __webpack_require__(3);
5238
5245
 
5239
5246
  var component = Object(componentNormalizer["a" /* default */])(
5240
5247
  src_mainvue_type_script_lang_js_,
5241
- mainvue_type_template_id_4eac4348_render,
5248
+ mainvue_type_template_id_3d54363f_render,
5242
5249
  staticRenderFns,
5243
5250
  false,
5244
5251
  null,
package/lib/utils/util.js CHANGED
@@ -1167,6 +1167,21 @@ var getHour = function getHour(datetime) {
1167
1167
  return datetimeObj.getHours();
1168
1168
  };
1169
1169
 
1170
+ /**
1171
+ * getMyWinTop
1172
+ * @desc 获取同域的top窗口
1173
+ * @param {object} wind - window对象
1174
+ **/
1175
+ var getMyWinTop = function getMyWinTop(wind) {
1176
+ wind = wind ? wind : win;
1177
+ try {
1178
+ wind.parent.document;
1179
+ return getMyWinTop(wind.parent);
1180
+ } catch (error) {
1181
+ return wind;
1182
+ }
1183
+ };
1184
+
1170
1185
  /**
1171
1186
  * getWeekNumber
1172
1187
  * @desc 当年第几周
@@ -2920,6 +2935,7 @@ exports.default = {
2920
2935
  getCurrentDate: getCurrentDate,
2921
2936
  getCurrentDateTime: getCurrentDateTime,
2922
2937
  getHour: getHour,
2938
+ getMyWinTop: getMyWinTop,
2923
2939
  getWeekNumber: getWeekNumber,
2924
2940
  getLength: getLength,
2925
2941
  getMainConfig: getMainConfig,
package/lib/wujie.js CHANGED
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
1250
1250
  return datetimeObj.getHours();
1251
1251
  };
1252
1252
 
1253
+ /**
1254
+ * getMyWinTop
1255
+ * @desc 获取同域的top窗口
1256
+ * @param {object} wind - window对象
1257
+ **/
1258
+ var getMyWinTop = function getMyWinTop(wind) {
1259
+ wind = wind ? wind : win;
1260
+ try {
1261
+ wind.parent.document;
1262
+ return getMyWinTop(wind.parent);
1263
+ } catch (error) {
1264
+ return wind;
1265
+ }
1266
+ };
1267
+
1253
1268
  /**
1254
1269
  * getWeekNumber
1255
1270
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
3003
3018
  getCurrentDate: getCurrentDate,
3004
3019
  getCurrentDateTime: getCurrentDateTime,
3005
3020
  getHour: getHour,
3021
+ getMyWinTop: getMyWinTop,
3006
3022
  getWeekNumber: getWeekNumber,
3007
3023
  getLength: getLength,
3008
3024
  getMainConfig: getMainConfig,
package/lib/wxlogin.js CHANGED
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
1250
1250
  return datetimeObj.getHours();
1251
1251
  };
1252
1252
 
1253
+ /**
1254
+ * getMyWinTop
1255
+ * @desc 获取同域的top窗口
1256
+ * @param {object} wind - window对象
1257
+ **/
1258
+ var getMyWinTop = function getMyWinTop(wind) {
1259
+ wind = wind ? wind : win;
1260
+ try {
1261
+ wind.parent.document;
1262
+ return getMyWinTop(wind.parent);
1263
+ } catch (error) {
1264
+ return wind;
1265
+ }
1266
+ };
1267
+
1253
1268
  /**
1254
1269
  * getWeekNumber
1255
1270
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
3003
3018
  getCurrentDate: getCurrentDate,
3004
3019
  getCurrentDateTime: getCurrentDateTime,
3005
3020
  getHour: getHour,
3021
+ getMyWinTop: getMyWinTop,
3006
3022
  getWeekNumber: getWeekNumber,
3007
3023
  getLength: getLength,
3008
3024
  getMainConfig: getMainConfig,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.5.44",
3
+ "version": "0.5.45",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
@@ -96,7 +96,7 @@
96
96
  "cp-cli": "^1.0.2",
97
97
  "cross-env": "^3.1.3",
98
98
  "css-loader": "^2.1.0",
99
- "eoss-element": "^0.2.85",
99
+ "eoss-element": "^0.2.86",
100
100
  "es6-promise": "^4.0.5",
101
101
  "eslint": "4.18.2",
102
102
  "eslint-config-elemefe": "0.1.1",
@@ -70,18 +70,15 @@ export default {
70
70
  evt.preventDefault();
71
71
  let width = 0;
72
72
  let height = 0;
73
+ let win;
73
74
  try {
74
- width = util.win.top.screen.availWidth - 10;
75
- height = util.win.top.screen.availHeight - 60;
75
+ util.win.top.document;
76
+ win = util.win.top;
76
77
  } catch (error) {
77
- try {
78
- width = util.win.parent.screen.availWidth - 10;
79
- height = util.win.parent.screen.availHeight - 60;
80
- } catch (error) {
81
- width = util.win.screen.availWidth - 10;
82
- height = util.win.screen.availHeight - 60;
83
- }
78
+ win = util.getMyWinTop();
84
79
  }
80
+ width = win.screen.availWidth - 10;
81
+ height = win.screen.availHeight - 60;
85
82
  let flag = true;
86
83
  if (this.esForm) {
87
84
  let params = util.getParams({ url: this.link });
@@ -863,7 +863,6 @@ export default {
863
863
  });
864
864
  },
865
865
  getTableData(res) {
866
- console.log(11212);
867
866
  let where;
868
867
  let first;
869
868
  if (res) {
@@ -381,18 +381,15 @@ export default {
381
381
  created() {
382
382
  let availWidth = 0;
383
383
  let availHeight = 0;
384
+ let win;
384
385
  try {
385
- availWidth = util.win.top.document.body.offsetWidth - 260;
386
- availHeight = util.win.top.document.body.offsetHeight - 60;
386
+ util.win.top.document;
387
+ win = util.win.top;
387
388
  } catch (error) {
388
- try {
389
- availWidth = util.win.parent.document.body.offsetWidth - 260;
390
- availHeight = util.win.parent.document.body.offsetHeight - 60;
391
- } catch (error) {
392
- availWidth = util.win.document.body.offsetWidth - 260;
393
- availHeight = util.win.document.body.offsetHeight - 60;
394
- }
389
+ win = util.getMyWinTop();
395
390
  }
391
+ availWidth = win.document.body.offsetWidth - 260;
392
+ availHeight = win.document.body.offsetHeight - 60;
396
393
  this.sizes.max = { width: `${availWidth}px`, height: `${availHeight}px` };
397
394
  if (
398
395
  this.size === 'full' ||
@@ -575,18 +575,15 @@ export default {
575
575
  let name = item.name;
576
576
  let width = 0;
577
577
  let height = 0;
578
+ let win;
578
579
  try {
579
- width = util.win.top.screen.availWidth - 10;
580
- height = util.win.top.screen.availHeight - 60;
580
+ util.win.top.document;
581
+ win = util.win.top;
581
582
  } catch (error) {
582
- try {
583
- width = util.win.parent.screen.availWidth - 10;
584
- height = util.win.parent.screen.availHeight - 60;
585
- } catch (error) {
586
- width = util.win.screen.availWidth - 10;
587
- height = util.win.screen.availHeight - 60;
588
- }
583
+ win = util.getMyWinTop();
589
584
  }
585
+ width = win.screen.availWidth - 10;
586
+ height = win.screen.availHeight - 60;
590
587
  if (item.url) {
591
588
  url = this.handleUrlJoinParams(item);
592
589
  }
@@ -658,15 +655,15 @@ export default {
658
655
  if (this.closeDialog && this.esDialog) {
659
656
  this.esDialog.handleClose();
660
657
  } else if (util.win.opener) {
658
+ let win;
661
659
  try {
662
- util.win.top.close();
660
+ util.win.top.document;
661
+ win = util.win.top;
663
662
  } catch (error) {
664
- try {
665
- util.win.parent.close();
666
- } catch (error) {
667
- util.win.postMessage({ type: 0 }, '*');
668
- }
663
+ win = util.getMyWinTop();
669
664
  }
665
+ win.close();
666
+ win.postMessage({ type: 0 }, '*');
670
667
  }
671
668
  if (this.events && this.events.success) {
672
669
  this.events.success();
@@ -98,15 +98,14 @@ export default {
98
98
  duration: 500,
99
99
  onClose: () => {
100
100
  util.removeStorage(['mainConfig', 'jump']);
101
+ let win;
101
102
  try {
102
- util.win.top.location.reload();
103
+ util.win.top.document;
104
+ win = util.win.top;
103
105
  } catch (error) {
104
- try {
105
- util.win.parent.location.reload();
106
- } catch (error) {
107
- util.win.location.reload();
108
- }
106
+ win = util.getMyWinTop();
109
107
  }
108
+ win.location.reload();
110
109
  }
111
110
  });
112
111
  } else {
@@ -147,7 +147,10 @@ export default {
147
147
  type: Boolean,
148
148
  default: false
149
149
  },
150
- maxHeight: String
150
+ maxHeight: {
151
+ type: String,
152
+ default: '100%'
153
+ }
151
154
  },
152
155
  watch: {
153
156
  subSystem: {
@@ -65,7 +65,7 @@
65
65
  :storage="storage"
66
66
  :notice="notice"
67
67
  :data="handleData"
68
- :max-height="maxHeight"
68
+ :max-height="_maxHeight"
69
69
  @select="
70
70
  (res) => {
71
71
  handleSelect(res, 'sys');
@@ -267,7 +267,7 @@ import store from 'eoss-ui/src/utils/store';
267
267
  import util from 'eoss-ui/src/utils/util';
268
268
  const isIE = navigator.userAgent.indexOf('MSIE') != -1;
269
269
  const log = util.getParams('console');
270
- const appCode = util.getParams('appCode');
270
+ const appCode = util.getParams('appCode') || util.getParams('appcode');
271
271
  export default {
272
272
  name: 'EsMain',
273
273
  inheritAttrs: false,
@@ -421,6 +421,13 @@ export default {
421
421
  showHeader() {
422
422
  return this.isHeader == 0 ? false : this.header;
423
423
  },
424
+ _maxHeight() {
425
+ if (this.maxHeight) {
426
+ return this.maxHeight;
427
+ }
428
+ console.log(document.body.clientHeight - 50);
429
+ return String(document.body.clientHeight - 77);
430
+ },
424
431
  showSide() {
425
432
  return this.isSide !== null ? this.isSide : this.sideNav;
426
433
  },
@@ -174,8 +174,7 @@ export default {
174
174
  try {
175
175
  this.reload && util.win.top.location.reload();
176
176
  } catch (error) {
177
- this.reload && util.win.location.reload();
178
- util.win.postMessage({ type: 3 }, '*');
177
+ this.reload && util.win.postMessage({ type: 3 }, '*');
179
178
  }
180
179
  } else {
181
180
  this.$message({
@@ -257,8 +256,7 @@ export default {
257
256
  try {
258
257
  this.reload && util.win.top.location.reload();
259
258
  } catch (error) {
260
- this.reload && util.win.location.reload();
261
- util.win.postMessage({ type: 3 }, '*');
259
+ this.reload && util.win.postMessage({ type: 3 }, '*');
262
260
  }
263
261
  } else {
264
262
  this.scanCode = setTimeout(() => {