eoss-ui 0.5.29 → 0.5.31

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 (57) hide show
  1. package/lib/button-group.js +20 -3
  2. package/lib/button.js +20 -3
  3. package/lib/cascader.js +18 -15
  4. package/lib/checkbox-group.js +39 -11
  5. package/lib/data-table-form.js +20 -3
  6. package/lib/data-table.js +34 -16
  7. package/lib/date-picker.js +20 -3
  8. package/lib/dialog.js +20 -3
  9. package/lib/eoss-ui.common.js +1810 -1809
  10. package/lib/flow-group.js +22 -5
  11. package/lib/flow-list.js +20 -3
  12. package/lib/flow.js +20 -3
  13. package/lib/form.js +50 -14
  14. package/lib/handle-user.js +20 -3
  15. package/lib/handler.js +20 -3
  16. package/lib/index.js +1 -1
  17. package/lib/input-number.js +20 -3
  18. package/lib/input.js +36 -10
  19. package/lib/login.js +45 -126
  20. package/lib/main.js +29 -12
  21. package/lib/nav.js +20 -3
  22. package/lib/page.js +20 -3
  23. package/lib/player.js +20 -3
  24. package/lib/qr-code.js +20 -3
  25. package/lib/radio-group.js +23 -6
  26. package/lib/retrial-auth.js +20 -3
  27. package/lib/select-ganged.js +20 -3
  28. package/lib/select.js +20 -3
  29. package/lib/selector-panel.js +20 -3
  30. package/lib/selector.js +23 -6
  31. package/lib/sizer.js +20 -3
  32. package/lib/steps.js +20 -3
  33. package/lib/switch.js +20 -3
  34. package/lib/table-form.js +20 -3
  35. package/lib/tabs.js +1626 -1570
  36. package/lib/tips.js +20 -3
  37. package/lib/tree-group.js +20 -3
  38. package/lib/tree.js +20 -3
  39. package/lib/upload.js +20 -3
  40. package/lib/utils/util.js +20 -3
  41. package/lib/wujie.js +20 -3
  42. package/lib/wxlogin.js +20 -3
  43. package/package.json +2 -2
  44. package/packages/cascader/src/main.vue +24 -19
  45. package/packages/checkbox-group/src/main.vue +14 -9
  46. package/packages/data-table/src/column.vue +9 -7
  47. package/packages/flow-group/src/main.vue +1 -1
  48. package/packages/form/src/main.vue +8 -1
  49. package/packages/input/src/main.vue +20 -16
  50. package/packages/login/src/main.vue +8 -3
  51. package/packages/login/src/resetPassword.vue +11 -114
  52. package/packages/main/src/userinfo.vue +5 -2
  53. package/packages/radio-group/src/main.vue +1 -1
  54. package/packages/selector/src/main.vue +1 -1
  55. package/packages/tabs/src/main.vue +563 -542
  56. package/src/index.js +1 -1
  57. package/src/utils/util.js +23 -3
@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
240
240
  delPendingRequest(response.config);
241
241
  loading && loading.close();
242
242
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
243
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
- localStorage.setItem('ssId', response.headers.ssid);
243
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
245
244
  localStorage.setItem('token', response.headers.authorization);
246
245
  localStorage.setItem('Authorization', response.headers.authorization);
247
246
  } else {
248
- sessionStorage.setItem('ssId', response.headers.ssid);
249
247
  sessionStorage.setItem('token', response.headers.authorization);
250
248
  sessionStorage.setItem('Authorization', response.headers.authorization);
251
249
  }
252
250
  }
251
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
252
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
253
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
254
+ } else {
255
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
256
+ }
257
+ }
253
258
  if (response.status === 200) {
254
259
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
255
260
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1910
1915
  return -1;
1911
1916
  };
1912
1917
 
1918
+ /**
1919
+ * isExist
1920
+ * @desc:判断是否存在
1921
+ * @author huangbo
1922
+ * @date 2022年5月7日
1923
+ * @param {Object} [obj] -
1924
+ **/
1925
+ var isExist = function isExist(obj) {
1926
+ return obj !== undefined && obj !== null && obj === '';
1927
+ };
1928
+
1913
1929
  /**
1914
1930
  * isFunction
1915
1931
  * @desc:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
2934
2950
  hsvTorgb: hsvTorgb,
2935
2951
  identical: identical,
2936
2952
  indexOfObj: indexOfObj,
2953
+ isExist: isExist,
2937
2954
  isFunction: isFunction,
2938
2955
  isLogged: isLogged,
2939
2956
  isLogined: isLogined,
package/lib/button.js CHANGED
@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
240
240
  delPendingRequest(response.config);
241
241
  loading && loading.close();
242
242
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
243
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
- localStorage.setItem('ssId', response.headers.ssid);
243
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
245
244
  localStorage.setItem('token', response.headers.authorization);
246
245
  localStorage.setItem('Authorization', response.headers.authorization);
247
246
  } else {
248
- sessionStorage.setItem('ssId', response.headers.ssid);
249
247
  sessionStorage.setItem('token', response.headers.authorization);
250
248
  sessionStorage.setItem('Authorization', response.headers.authorization);
251
249
  }
252
250
  }
251
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
252
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
253
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
254
+ } else {
255
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
256
+ }
257
+ }
253
258
  if (response.status === 200) {
254
259
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
255
260
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1910
1915
  return -1;
1911
1916
  };
1912
1917
 
1918
+ /**
1919
+ * isExist
1920
+ * @desc:判断是否存在
1921
+ * @author huangbo
1922
+ * @date 2022年5月7日
1923
+ * @param {Object} [obj] -
1924
+ **/
1925
+ var isExist = function isExist(obj) {
1926
+ return obj !== undefined && obj !== null && obj === '';
1927
+ };
1928
+
1913
1929
  /**
1914
1930
  * isFunction
1915
1931
  * @desc:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
2934
2950
  hsvTorgb: hsvTorgb,
2935
2951
  identical: identical,
2936
2952
  indexOfObj: indexOfObj,
2953
+ isExist: isExist,
2937
2954
  isFunction: isFunction,
2938
2955
  isLogged: isLogged,
2939
2956
  isLogined: isLogined,
package/lib/cascader.js CHANGED
@@ -206,7 +206,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
206
206
  name: 'EsCascader',
207
207
  inheritAttrs: false,
208
208
  props: {
209
- value: [String, Object, Array],
209
+ value: [String, Array],
210
210
  data: Array,
211
211
  options: Array,
212
212
  hide: {
@@ -302,23 +302,26 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
302
302
 
303
303
  if (!this.hide) {
304
304
  if (this.readonly) {
305
- var value = this.model.map(function (item) {
306
- if (Array.isArray(item)) {
307
- return item.map(function (ele) {
308
- if (typeof ele === 'string') {
309
- return ele;
305
+ var value = '';
306
+ if (this.model) {
307
+ value = Array.isArray(this.model) ? this.model.map(function (item) {
308
+ if (Array.isArray(item)) {
309
+ return item.map(function (ele) {
310
+ if (typeof ele === 'string') {
311
+ return ele;
312
+ } else {
313
+ return ele[_this.newProps.label];
314
+ }
315
+ }).join(_this.separator);
316
+ } else {
317
+ if (typeof item === 'string') {
318
+ return item;
310
319
  } else {
311
- return ele[_this.newProps.label];
320
+ return item[_this.newProps.label];
312
321
  }
313
- }).join(_this.separator);
314
- } else {
315
- if (typeof item === 'string') {
316
- return item;
317
- } else {
318
- return item[_this.newProps.label];
319
322
  }
320
- }
321
- }).join(this.multiple ? ',' : this.separator);
323
+ }).join(this.multiple ? ',' : this.separator) : this.model;
324
+ }
322
325
  return h('div', {
323
326
  class: ['el-cascader el-input__inner', { 'es-plain': this.plain }]
324
327
  }, [value]);
@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
239
239
  delPendingRequest(response.config);
240
240
  loading && loading.close();
241
241
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
242
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
243
- localStorage.setItem('ssId', response.headers.ssid);
242
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
243
  localStorage.setItem('token', response.headers.authorization);
245
244
  localStorage.setItem('Authorization', response.headers.authorization);
246
245
  } else {
247
- sessionStorage.setItem('ssId', response.headers.ssid);
248
246
  sessionStorage.setItem('token', response.headers.authorization);
249
247
  sessionStorage.setItem('Authorization', response.headers.authorization);
250
248
  }
251
249
  }
250
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
251
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
252
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
253
+ } else {
254
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
255
+ }
256
+ }
252
257
  if (response.status === 200) {
253
258
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
254
259
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1909,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1909
1914
  return -1;
1910
1915
  };
1911
1916
 
1917
+ /**
1918
+ * isExist
1919
+ * @desc:判断是否存在
1920
+ * @author huangbo
1921
+ * @date 2022年5月7日
1922
+ * @param {Object} [obj] -
1923
+ **/
1924
+ var isExist = function isExist(obj) {
1925
+ return obj !== undefined && obj !== null && obj === '';
1926
+ };
1927
+
1912
1928
  /**
1913
1929
  * isFunction
1914
1930
  * @desc:判断是否是函数
@@ -2933,6 +2949,7 @@ var watermark = function watermark(option) {
2933
2949
  hsvTorgb: hsvTorgb,
2934
2950
  identical: identical,
2935
2951
  indexOfObj: indexOfObj,
2952
+ isExist: isExist,
2936
2953
  isFunction: isFunction,
2937
2954
  isLogged: isLogged,
2938
2955
  isLogined: isLogined,
@@ -3665,7 +3682,7 @@ module.exports = require("vue");
3665
3682
  // ESM COMPAT FLAG
3666
3683
  __webpack_require__.r(__webpack_exports__);
3667
3684
 
3668
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=template&id=796a733a&
3685
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox-group/src/main.vue?vue&type=template&id=68f9206f&
3669
3686
  var render = function () {
3670
3687
  var _vm = this
3671
3688
  var _h = _vm.$createElement
@@ -3706,7 +3723,11 @@ var render = function () {
3706
3723
  },
3707
3724
  },
3708
3725
  "el-checkbox-group",
3709
- _vm.$attrs,
3726
+ Object.assign(
3727
+ {},
3728
+ { valueKey: _vm.valKey, labelKey: _vm.label },
3729
+ _vm.$attrs
3730
+ ),
3710
3731
  false
3711
3732
  ),
3712
3733
  _vm.$listeners
@@ -3798,7 +3819,7 @@ var staticRenderFns = []
3798
3819
  render._withStripped = true
3799
3820
 
3800
3821
 
3801
- // CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=796a733a&
3822
+ // CONCATENATED MODULE: ./packages/checkbox-group/src/main.vue?vue&type=template&id=68f9206f&
3802
3823
 
3803
3824
  // EXTERNAL MODULE: ./src/config/api.js
3804
3825
  var api = __webpack_require__(1);
@@ -3914,6 +3935,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3914
3935
  type: String,
3915
3936
  default: ''
3916
3937
  },
3938
+ separator: {
3939
+ type: String,
3940
+ default: '、'
3941
+ },
3917
3942
  display: {
3918
3943
  type: Boolean,
3919
3944
  default: true
@@ -3972,6 +3997,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3972
3997
  return this.value === undefined ? [] : this.value;
3973
3998
  },
3974
3999
  set: function set(val) {
4000
+ console.log(val);
3975
4001
  return val;
3976
4002
  }
3977
4003
  },
@@ -3999,15 +4025,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
3999
4025
  return item[_this.label];
4000
4026
  }
4001
4027
  if (util["a" /* default */].isObject(_this.results[0])) {
4002
- return _this.results.map(function (ele) {
4003
- if (ele[_this.valueKey] === item) {
4004
- return ele[_this.label];
4028
+ var vals = [];
4029
+ _this.results.forEach(function (ele) {
4030
+ if (ele[_this.valKey] === item) {
4031
+ vals.push(ele[_this.label]);
4005
4032
  }
4006
- }).join(' ');
4033
+ });
4034
+ return vals.join(_this.separator);
4007
4035
  }
4008
4036
  return item;
4009
4037
  });
4010
- return label.join(' ');
4038
+ return label.join(this.separator);
4011
4039
  }
4012
4040
  },
4013
4041
  watch: {
@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
239
239
  delPendingRequest(response.config);
240
240
  loading && loading.close();
241
241
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
242
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
243
- localStorage.setItem('ssId', response.headers.ssid);
242
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
243
  localStorage.setItem('token', response.headers.authorization);
245
244
  localStorage.setItem('Authorization', response.headers.authorization);
246
245
  } else {
247
- sessionStorage.setItem('ssId', response.headers.ssid);
248
246
  sessionStorage.setItem('token', response.headers.authorization);
249
247
  sessionStorage.setItem('Authorization', response.headers.authorization);
250
248
  }
251
249
  }
250
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
251
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
252
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
253
+ } else {
254
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
255
+ }
256
+ }
252
257
  if (response.status === 200) {
253
258
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
254
259
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1909,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1909
1914
  return -1;
1910
1915
  };
1911
1916
 
1917
+ /**
1918
+ * isExist
1919
+ * @desc:判断是否存在
1920
+ * @author huangbo
1921
+ * @date 2022年5月7日
1922
+ * @param {Object} [obj] -
1923
+ **/
1924
+ var isExist = function isExist(obj) {
1925
+ return obj !== undefined && obj !== null && obj === '';
1926
+ };
1927
+
1912
1928
  /**
1913
1929
  * isFunction
1914
1930
  * @desc:判断是否是函数
@@ -2933,6 +2949,7 @@ var watermark = function watermark(option) {
2933
2949
  hsvTorgb: hsvTorgb,
2934
2950
  identical: identical,
2935
2951
  indexOfObj: indexOfObj,
2952
+ isExist: isExist,
2936
2953
  isFunction: isFunction,
2937
2954
  isLogged: isLogged,
2938
2955
  isLogined: isLogined,
package/lib/data-table.js CHANGED
@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
239
239
  delPendingRequest(response.config);
240
240
  loading && loading.close();
241
241
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
242
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
243
- localStorage.setItem('ssId', response.headers.ssid);
242
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
243
  localStorage.setItem('token', response.headers.authorization);
245
244
  localStorage.setItem('Authorization', response.headers.authorization);
246
245
  } else {
247
- sessionStorage.setItem('ssId', response.headers.ssid);
248
246
  sessionStorage.setItem('token', response.headers.authorization);
249
247
  sessionStorage.setItem('Authorization', response.headers.authorization);
250
248
  }
251
249
  }
250
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
251
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
252
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
253
+ } else {
254
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
255
+ }
256
+ }
252
257
  if (response.status === 200) {
253
258
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
254
259
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1909,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1909
1914
  return -1;
1910
1915
  };
1911
1916
 
1917
+ /**
1918
+ * isExist
1919
+ * @desc:判断是否存在
1920
+ * @author huangbo
1921
+ * @date 2022年5月7日
1922
+ * @param {Object} [obj] -
1923
+ **/
1924
+ var isExist = function isExist(obj) {
1925
+ return obj !== undefined && obj !== null && obj === '';
1926
+ };
1927
+
1912
1928
  /**
1913
1929
  * isFunction
1914
1930
  * @desc:判断是否是函数
@@ -2933,6 +2949,7 @@ var watermark = function watermark(option) {
2933
2949
  hsvTorgb: hsvTorgb,
2934
2950
  identical: identical,
2935
2951
  indexOfObj: indexOfObj,
2952
+ isExist: isExist,
2936
2953
  isFunction: isFunction,
2937
2954
  isLogged: isLogged,
2938
2955
  isLogined: isLogined,
@@ -3940,8 +3957,8 @@ childrenvue_type_template_id_29bcbc72_render._withStripped = true
3940
3957
 
3941
3958
  // CONCATENATED MODULE: ./packages/data-table/src/children.vue?vue&type=template&id=29bcbc72&
3942
3959
 
3943
- // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=04b841ca&
3944
- var columnvue_type_template_id_04b841ca_render = function () {
3960
+ // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/column.vue?vue&type=template&id=ce722e32&
3961
+ var columnvue_type_template_id_ce722e32_render = function () {
3945
3962
  var _vm = this
3946
3963
  var _h = _vm.$createElement
3947
3964
  var _c = _vm._self._c || _h
@@ -4663,11 +4680,11 @@ var columnvue_type_template_id_04b841ca_render = function () {
4663
4680
  2
4664
4681
  )
4665
4682
  }
4666
- var columnvue_type_template_id_04b841ca_staticRenderFns = []
4667
- columnvue_type_template_id_04b841ca_render._withStripped = true
4683
+ var columnvue_type_template_id_ce722e32_staticRenderFns = []
4684
+ columnvue_type_template_id_ce722e32_render._withStripped = true
4668
4685
 
4669
4686
 
4670
- // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=04b841ca&
4687
+ // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=ce722e32&
4671
4688
 
4672
4689
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
4673
4690
  var regenerator_ = __webpack_require__(12);
@@ -5392,12 +5409,12 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
5392
5409
  } else if (Array.isArray(rows[field])) {
5393
5410
  var vals = rows[field].map(function (item) {
5394
5411
  if (util["a" /* default */].isObject(item)) {
5395
- str = item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
5412
+ return item[_this2.labelKey] || item['name'] || item['label'] || item['shortName'];
5396
5413
  } else {
5397
5414
  if (data && data.length && util["a" /* default */].isObject(data[0])) {
5398
- str = _this2.getLabel(data, item);
5415
+ return _this2.getLabel(data, item);
5399
5416
  }
5400
- str = item;
5417
+ return item;
5401
5418
  }
5402
5419
  });
5403
5420
  str = vals.join(this.symbol ? this.symbol : '-');
@@ -5405,16 +5422,17 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
5405
5422
  if (this.valueToString) {
5406
5423
  var _vals = rows[field].split(',').map(function (item) {
5407
5424
  if (data && data.length && util["a" /* default */].isObject(data[0])) {
5408
- str = _this2.getLabel(data, item);
5425
+ return _this2.getLabel(data, item);
5409
5426
  }
5410
- str = item;
5427
+ return item;
5411
5428
  });
5412
5429
  str = _vals.join(this.symbol ? this.symbol : '-');
5413
5430
  } else {
5414
5431
  if (data && data.length && util["a" /* default */].isObject(data[0])) {
5415
5432
  str = this.getLabel(data, rows[field]);
5433
+ } else {
5434
+ str = rows[field];
5416
5435
  }
5417
- str = rows[field];
5418
5436
  }
5419
5437
  }
5420
5438
  if (str && flag) {
@@ -5531,8 +5549,8 @@ var componentNormalizer = __webpack_require__(3);
5531
5549
 
5532
5550
  var component = Object(componentNormalizer["a" /* default */])(
5533
5551
  src_columnvue_type_script_lang_js_,
5534
- columnvue_type_template_id_04b841ca_render,
5535
- columnvue_type_template_id_04b841ca_staticRenderFns,
5552
+ columnvue_type_template_id_ce722e32_render,
5553
+ columnvue_type_template_id_ce722e32_staticRenderFns,
5536
5554
  false,
5537
5555
  null,
5538
5556
  null,
@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
240
240
  delPendingRequest(response.config);
241
241
  loading && loading.close();
242
242
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
243
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
- localStorage.setItem('ssId', response.headers.ssid);
243
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
245
244
  localStorage.setItem('token', response.headers.authorization);
246
245
  localStorage.setItem('Authorization', response.headers.authorization);
247
246
  } else {
248
- sessionStorage.setItem('ssId', response.headers.ssid);
249
247
  sessionStorage.setItem('token', response.headers.authorization);
250
248
  sessionStorage.setItem('Authorization', response.headers.authorization);
251
249
  }
252
250
  }
251
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
252
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
253
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
254
+ } else {
255
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
256
+ }
257
+ }
253
258
  if (response.status === 200) {
254
259
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
255
260
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1910
1915
  return -1;
1911
1916
  };
1912
1917
 
1918
+ /**
1919
+ * isExist
1920
+ * @desc:判断是否存在
1921
+ * @author huangbo
1922
+ * @date 2022年5月7日
1923
+ * @param {Object} [obj] -
1924
+ **/
1925
+ var isExist = function isExist(obj) {
1926
+ return obj !== undefined && obj !== null && obj === '';
1927
+ };
1928
+
1913
1929
  /**
1914
1930
  * isFunction
1915
1931
  * @desc:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
2934
2950
  hsvTorgb: hsvTorgb,
2935
2951
  identical: identical,
2936
2952
  indexOfObj: indexOfObj,
2953
+ isExist: isExist,
2937
2954
  isFunction: isFunction,
2938
2955
  isLogged: isLogged,
2939
2956
  isLogined: isLogined,
package/lib/dialog.js CHANGED
@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
239
239
  delPendingRequest(response.config);
240
240
  loading && loading.close();
241
241
  if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
242
- if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
243
- localStorage.setItem('ssId', response.headers.ssid);
242
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
244
243
  localStorage.setItem('token', response.headers.authorization);
245
244
  localStorage.setItem('Authorization', response.headers.authorization);
246
245
  } else {
247
- sessionStorage.setItem('ssId', response.headers.ssid);
248
246
  sessionStorage.setItem('token', response.headers.authorization);
249
247
  sessionStorage.setItem('Authorization', response.headers.authorization);
250
248
  }
251
249
  }
250
+ if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
251
+ if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
252
+ localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
253
+ } else {
254
+ sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
255
+ }
256
+ }
252
257
  if (response.status === 200) {
253
258
  if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
254
259
  removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1909,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
1909
1914
  return -1;
1910
1915
  };
1911
1916
 
1917
+ /**
1918
+ * isExist
1919
+ * @desc:判断是否存在
1920
+ * @author huangbo
1921
+ * @date 2022年5月7日
1922
+ * @param {Object} [obj] -
1923
+ **/
1924
+ var isExist = function isExist(obj) {
1925
+ return obj !== undefined && obj !== null && obj === '';
1926
+ };
1927
+
1912
1928
  /**
1913
1929
  * isFunction
1914
1930
  * @desc:判断是否是函数
@@ -2933,6 +2949,7 @@ var watermark = function watermark(option) {
2933
2949
  hsvTorgb: hsvTorgb,
2934
2950
  identical: identical,
2935
2951
  indexOfObj: indexOfObj,
2952
+ isExist: isExist,
2936
2953
  isFunction: isFunction,
2937
2954
  isLogged: isLogged,
2938
2955
  isLogined: isLogined,