eoss-ui 0.4.59 → 0.4.60

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 (52) hide show
  1. package/lib/button-group.js +3 -1
  2. package/lib/button.js +3 -1
  3. package/lib/checkbox-group.js +3 -1
  4. package/lib/data-table-form.js +3 -1
  5. package/lib/data-table.js +3 -1
  6. package/lib/date-picker.js +3 -1
  7. package/lib/dialog.js +3 -1
  8. package/lib/eoss-ui.common.js +132 -91
  9. package/lib/flow-group.js +3 -1
  10. package/lib/flow-list.js +3 -1
  11. package/lib/flow.js +3 -1
  12. package/lib/form.js +3 -1
  13. package/lib/handle-user.js +3 -1
  14. package/lib/handler.js +8 -4
  15. package/lib/index.js +1 -1
  16. package/lib/input-number.js +3 -1
  17. package/lib/input.js +3 -1
  18. package/lib/login.js +3 -1
  19. package/lib/main.js +54 -39
  20. package/lib/mainComp.js +52 -26
  21. package/lib/nav.js +3 -1
  22. package/lib/page.js +3 -1
  23. package/lib/player.js +3 -1
  24. package/lib/qr-code.js +3 -1
  25. package/lib/radio-group.js +3 -1
  26. package/lib/retrial-auth.js +3 -1
  27. package/lib/select-ganged.js +3 -1
  28. package/lib/select.js +3 -1
  29. package/lib/selector-panel.js +3 -1
  30. package/lib/selector.js +3 -1
  31. package/lib/sizer.js +3 -1
  32. package/lib/steps.js +3 -1
  33. package/lib/switch.js +3 -1
  34. package/lib/table-form.js +3 -1
  35. package/lib/tabs.js +3 -1
  36. package/lib/tips.js +3 -1
  37. package/lib/tree-group.js +3 -1
  38. package/lib/tree.js +3 -1
  39. package/lib/upload.js +9 -7
  40. package/lib/utils/util.js +3 -1
  41. package/lib/wujie.js +3 -1
  42. package/lib/wxlogin.js +3 -1
  43. package/package.json +1 -1
  44. package/packages/handler/src/main.vue +3 -1
  45. package/packages/main/src/main.vue +56 -46
  46. package/packages/main/src/userinfo.vue +3 -1
  47. package/packages/mainComp/src/main.vue +23 -10
  48. package/packages/mainComp/src/userinfo.vue +22 -9
  49. package/packages/upload/src/main.vue +7 -6
  50. package/src/index.js +1 -1
  51. package/src/utils/util.js +3 -1
  52. package/CHANGELOG.md +0 -929
package/lib/upload.js CHANGED
@@ -271,8 +271,10 @@ var ajax = function ajax(_ref) {
271
271
  pathname = pathname.split('/');
272
272
  pathname.splice(pathname.length - 1);
273
273
  pathname = pathname.join('/');
274
+ src = pathname + loginPage.replace('./', '/');
275
+ } else {
276
+ src = pathname + loginPage.replace('./', '');
274
277
  }
275
- src = pathname + loginPage.replace('./', '');
276
278
  } else {
277
279
  src = loginPage;
278
280
  }
@@ -2846,8 +2848,8 @@ function normalizeComponent(
2846
2848
  // ESM COMPAT FLAG
2847
2849
  __webpack_require__.r(__webpack_exports__);
2848
2850
 
2849
- // 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=456fded3&
2850
- var mainvue_type_template_id_456fded3_render = function () {
2851
+ // 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=a329683c&
2852
+ var mainvue_type_template_id_a329683c_render = function () {
2851
2853
  var _vm = this
2852
2854
  var _h = _vm.$createElement
2853
2855
  var _c = _vm._self._c || _h
@@ -3209,10 +3211,10 @@ var mainvue_type_template_id_456fded3_render = function () {
3209
3211
  )
3210
3212
  }
3211
3213
  var staticRenderFns = []
3212
- mainvue_type_template_id_456fded3_render._withStripped = true
3214
+ mainvue_type_template_id_a329683c_render._withStripped = true
3213
3215
 
3214
3216
 
3215
- // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=456fded3&
3217
+ // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=a329683c&
3216
3218
 
3217
3219
  // EXTERNAL MODULE: ./src/config/api.js
3218
3220
  var api = __webpack_require__(1);
@@ -3957,7 +3959,7 @@ var _props;
3957
3959
  } else if (suffix.includes('pdf')) {
3958
3960
  util["a" /* default */].win.open(this.host + (url ? url : api["hb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
3959
3961
  } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
3960
- this.imgUrl = res.url ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
3962
+ this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/']) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
3961
3963
  this.title = file.originalName;
3962
3964
  this.showImg = true;
3963
3965
  this.$nextTick(function () {
@@ -4254,7 +4256,7 @@ var componentNormalizer = __webpack_require__(3);
4254
4256
 
4255
4257
  var component = Object(componentNormalizer["a" /* default */])(
4256
4258
  src_mainvue_type_script_lang_js_,
4257
- mainvue_type_template_id_456fded3_render,
4259
+ mainvue_type_template_id_a329683c_render,
4258
4260
  staticRenderFns,
4259
4261
  false,
4260
4262
  null,
package/lib/utils/util.js CHANGED
@@ -186,8 +186,10 @@ var ajax = function ajax(_ref) {
186
186
  pathname = pathname.split('/');
187
187
  pathname.splice(pathname.length - 1);
188
188
  pathname = pathname.join('/');
189
+ src = pathname + loginPage.replace('./', '/');
190
+ } else {
191
+ src = pathname + loginPage.replace('./', '');
189
192
  }
190
- src = pathname + loginPage.replace('./', '');
191
193
  } else {
192
194
  src = loginPage;
193
195
  }
package/lib/wujie.js CHANGED
@@ -271,8 +271,10 @@ var ajax = function ajax(_ref) {
271
271
  pathname = pathname.split('/');
272
272
  pathname.splice(pathname.length - 1);
273
273
  pathname = pathname.join('/');
274
+ src = pathname + loginPage.replace('./', '/');
275
+ } else {
276
+ src = pathname + loginPage.replace('./', '');
274
277
  }
275
- src = pathname + loginPage.replace('./', '');
276
278
  } else {
277
279
  src = loginPage;
278
280
  }
package/lib/wxlogin.js CHANGED
@@ -271,8 +271,10 @@ var ajax = function ajax(_ref) {
271
271
  pathname = pathname.split('/');
272
272
  pathname.splice(pathname.length - 1);
273
273
  pathname = pathname.join('/');
274
+ src = pathname + loginPage.replace('./', '/');
275
+ } else {
276
+ src = pathname + loginPage.replace('./', '');
274
277
  }
275
- src = pathname + loginPage.replace('./', '');
276
278
  } else {
277
279
  src = loginPage;
278
280
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.4.59",
3
+ "version": "0.4.60",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
package/packages/handler/src/main.vue CHANGED
@@ -293,8 +293,10 @@ export default {
293
293
  pathname = pathname.split('/');
294
294
  pathname.splice(pathname.length - 1);
295
295
  pathname = pathname.join('/');
296
+ src = pathname + loginPage.replace('./', '/');
297
+ } else {
298
+ src = pathname + loginPage.replace('./', '');
296
299
  }
297
- src = pathname + loginPage.replace('./', '');
298
300
  } else {
299
301
  src = loginPage;
300
302
  }
package/packages/main/src/main.vue CHANGED
@@ -602,7 +602,8 @@ export default {
602
602
  isTabs: false,
603
603
  isHeader: '',
604
604
  isSide: null,
605
- navIds: null
605
+ navIds: null,
606
+ timer: null
606
607
  };
607
608
  },
608
609
  created() {
@@ -1751,55 +1752,63 @@ export default {
1751
1752
  type: 'warning'
1752
1753
  };
1753
1754
  } else {
1754
- console.log('handleReLogin');
1755
1755
  msg = '登录已过期，请重新登录！';
1756
1756
  }
1757
1757
  }
1758
- this.$confirm(msg, btn)
1759
- .then(() => {
1760
- util.removeStorage([
1761
- 'Authorization',
1762
- 'token',
1763
- 'ssId',
1764
- 'userId',
1765
- 'userName',
1766
- 'auth',
1767
- 'deviceUnique',
1768
- 'menus',
1769
- 'useCaseCodes',
1770
- 'mainConfig',
1771
- 'jump'
1772
- ]);
1773
- const loginPage =
1774
- util.getStorage('login') || util.getStorage('loginPage');
1775
- if (loginPage) {
1776
- let src;
1777
- if (!util.startWith(loginPage, ['http', '/'])) {
1778
- let pathname = util.win.top.location.pathname;
1779
- if (pathname !== '/') {
1780
- pathname = pathname.split('/');
1781
- pathname.splice(pathname.length - 1);
1782
- pathname = pathname.join('/');
1758
+ !this.timer &&
1759
+ (this.timer = setTimeout(() => {
1760
+ console.log('handleReLogin');
1761
+ this.$confirm(msg, btn)
1762
+ .then(() => {
1763
+ util.removeStorage([
1764
+ 'Authorization',
1765
+ 'token',
1766
+ 'ssId',
1767
+ 'userId',
1768
+ 'userName',
1769
+ 'auth',
1770
+ 'deviceUnique',
1771
+ 'menus',
1772
+ 'useCaseCodes',
1773
+ 'mainConfig',
1774
+ 'jump'
1775
+ ]);
1776
+ const loginPage =
1777
+ util.getStorage('login') || util.getStorage('loginPage');
1778
+ if (loginPage) {
1779
+ let src;
1780
+ if (!util.startWith(loginPage, ['http', '/'])) {
1781
+ let pathname = util.win.top.location.pathname;
1782
+ if (pathname !== '/') {
1783
+ pathname = pathname.split('/');
1784
+ pathname.splice(pathname.length - 1);
1785
+ pathname = pathname.join('/');
1786
+ src = pathname + loginPage.replace('./', '/');
1787
+ } else {
1788
+ src = pathname + loginPage.replace('./', '');
1789
+ }
1790
+ } else {
1791
+ src = loginPage;
1792
+ }
1793
+ util.win.top.location.href = src;
1794
+ } else if (util.win.top.location.href.indexOf('main.html') > -1) {
1795
+ util.win.top.location.href = './login.html';
1796
+ } else {
1797
+ const hash = util.win.top.location.hash;
1798
+ if (hash) {
1799
+ const len = util.win.top.location.href.indexOf(hash);
1800
+ util.win.top.location.href =
1801
+ util.win.location.href.slice(0, len) + '#/login';
1802
+ } else {
1803
+ util.win.top.location.href = '/login.html';
1804
+ }
1783
1805
  }
1784
- src = pathname + loginPage.replace('./', '');
1785
- } else {
1786
- src = loginPage;
1787
- }
1788
- util.win.top.location.href = src;
1789
- } else if (util.win.top.location.href.indexOf('main.html') > -1) {
1790
- util.win.top.location.href = './login.html';
1791
- } else {
1792
- const hash = util.win.top.location.hash;
1793
- if (hash) {
1794
- const len = util.win.top.location.href.indexOf(hash);
1795
- util.win.top.location.href =
1796
- util.win.location.href.slice(0, len) + '#/login';
1797
- } else {
1798
- util.win.top.location.href = '/login.html';
1799
- }
1800
- }
1801
- })
1802
- .catch((e) => {});
1806
+ })
1807
+ .catch((e) => {
1808
+ clearTimeout(this.timer);
1809
+ this.timer = null;
1810
+ });
1811
+ }, 1000));
1803
1812
  },
1804
1813
  openPage(url, name, width, height) {
1805
1814
  let src = url;
@@ -1826,6 +1835,7 @@ export default {
1826
1835
  }
1827
1836
  },
1828
1837
  beforeDestroy() {
1838
+ this.timer = null;
1829
1839
  if (this.client && this.client.connected) {
1830
1840
  this.client.disconnect();
1831
1841
  }
package/packages/main/src/userinfo.vue CHANGED
@@ -380,8 +380,10 @@ export default {
380
380
  pathname = pathname.split('/');
381
381
  pathname.splice(pathname.length - 1);
382
382
  pathname = pathname.join('/');
383
+ src = pathname + loginPage.replace('./', '/');
384
+ } else {
385
+ src = pathname + loginPage.replace('./', '');
383
386
  }
384
- src = pathname + loginPage.replace('./', '');
385
387
  } else {
386
388
  src = loginPage;
387
389
  }
package/packages/mainComp/src/main.vue CHANGED
@@ -1876,22 +1876,35 @@ export default {
1876
1876
  'mainConfig',
1877
1877
  'jump'
1878
1878
  ]);
1879
- if (util.win.top.location.href.indexOf('main.html') > -1) {
1879
+
1880
+ const loginPage =
1881
+ util.getStorage('login') || util.getStorage('loginPage');
1882
+ if (loginPage) {
1883
+ let src;
1884
+ if (!util.startWith(loginPage, ['http', '/'])) {
1885
+ let pathname = util.win.top.location.pathname;
1886
+ if (pathname !== '/') {
1887
+ pathname = pathname.split('/');
1888
+ pathname.splice(pathname.length - 1);
1889
+ pathname = pathname.join('/');
1890
+ src = pathname + loginPage.replace('./', '/');
1891
+ } else {
1892
+ src = pathname + loginPage.replace('./', '');
1893
+ }
1894
+ } else {
1895
+ src = loginPage;
1896
+ }
1897
+ util.win.top.location.href = src;
1898
+ } else if (util.win.top.location.href.indexOf('main.html') > -1) {
1880
1899
  util.win.top.location.href = './login.html';
1881
1900
  } else {
1882
1901
  const hash = util.win.top.location.hash;
1883
1902
  if (hash) {
1884
1903
  const len = util.win.top.location.href.indexOf(hash);
1885
- let href = util.win.top.location.href.slice(0, len) + '#/login';
1886
- util.win.top.location.href = href;
1904
+ util.win.top.location.href =
1905
+ util.win.location.href.slice(0, len) + '#/login';
1887
1906
  } else {
1888
- const loginPage =
1889
- util.getStorage('login') || util.getStorage('loginPage');
1890
- if (loginPage) {
1891
- util.win.top.location.href = loginPage;
1892
- } else {
1893
- util.win.top.location.href = '/login.html';
1894
- }
1907
+ util.win.top.location.href = '/login.html';
1895
1908
  }
1896
1909
  }
1897
1910
  })
package/packages/mainComp/src/userinfo.vue CHANGED
@@ -353,7 +353,27 @@ export default {
353
353
  type: 'warning'
354
354
  })
355
355
  .then(() => {
356
- if (util.win.top.location.href.indexOf('main.html') > -1) {
356
+ const loginPage =
357
+ util.getStorage('login') || util.getStorage('loginPage');
358
+ if (loginPage) {
359
+ let src;
360
+ if (!util.startWith(loginPage, ['http', '/'])) {
361
+ let pathname = util.win.top.location.pathname;
362
+ if (pathname !== '/') {
363
+ pathname = pathname.split('/');
364
+ pathname.splice(pathname.length - 1);
365
+ pathname = pathname.join('/');
366
+ src = pathname + loginPage.replace('./', '/');
367
+ } else {
368
+ src = pathname + loginPage.replace('./', '');
369
+ }
370
+ } else {
371
+ src = loginPage;
372
+ }
373
+ util.win.top.location.href = src;
374
+ } else if (
375
+ util.win.top.location.href.indexOf('main.html') > -1
376
+ ) {
357
377
  util.win.top.location.href = './login.html';
358
378
  } else {
359
379
  const hash = util.win.top.location.hash;
@@ -362,14 +382,7 @@ export default {
362
382
  util.win.top.location.href =
363
383
  util.win.location.href.slice(0, len) + '#/login';
364
384
  } else {
365
- const loginPage =
366
- util.getStorage('login') ||
367
- util.getStorage('loginPage');
368
- if (loginPage) {
369
- util.win.top.location.href = loginPage;
370
- } else {
371
- util.win.top.location.href = '/login.html';
372
- }
385
+ util.win.top.location.href = '/login.html';
373
386
  }
374
387
  }
375
388
  })
package/packages/upload/src/main.vue CHANGED
@@ -820,12 +820,13 @@ export default {
820
820
  suffix.includes('gif') ||
821
821
  suffix.includes('png')
822
822
  ) {
823
- this.imgUrl = res.url
824
- ? res.url
825
- : this.host +
826
- (url ? url : this.previewAdjunct) +
827
- '?adjunctId=' +
828
- file.adjunctId;
823
+ this.imgUrl =
824
+ res.url && util.startWith(url, ['http', '/'])
825
+ ? res.url
826
+ : this.host +
827
+ (url ? url : this.previewAdjunct) +
828
+ '?adjunctId=' +
829
+ file.adjunctId;
829
830
  this.title = file.originalName;
830
831
  this.showImg = true;
831
832
  this.$nextTick(() => {
package/src/index.js CHANGED
@@ -119,7 +119,7 @@ if (typeof window !== 'undefined' && window.Vue) {
119
119
  }
120
120
 
121
121
  export default {
122
- version: '0.4.59',
122
+ version: '0.4.60',
123
123
  install,
124
124
  Button,
125
125
  ButtonGroup,
package/src/utils/util.js CHANGED
@@ -208,8 +208,10 @@ const ajax = function ({
208
208
  pathname = pathname.split('/');
209
209
  pathname.splice(pathname.length - 1);
210
210
  pathname = pathname.join('/');
211
+ src = pathname + loginPage.replace('./', '/');
212
+ } else {
213
+ src = pathname + loginPage.replace('./', '');
211
214
  }
212
- src = pathname + loginPage.replace('./', '');
213
215
  } else {
214
216
  src = loginPage;
215
217
  }