cloud-web-corejs 1.0.66 → 1.0.67

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 (8) hide show
  1. package/package.json +1 -1
  2. package/src/components/excelExport/mixins.js +1 -1
  3. package/src/components/fileLibrary/mixins/indexMixins.js +0 -1
  4. package/src/components/table/index.js +1 -1
  5. package/src/utils/request.js +28 -28
  6. package/src/utils/vab.js +1 -1
  7. package/src/views/user/outLink/form_view.vue +39 -12
  8. package/src/views/user/outLink/view.vue +28 -23
package/src/views/user/outLink/form_view.vue CHANGED
@@ -64,6 +64,25 @@ export default {
64
64
 
65
65
  delete queryParam.urlmobile;
66
66
  delete queryParam.url;
67
+
68
+ if (purl.indexOf('.html') >= 0) {
69
+ let eUrl = purl;
70
+ let pstr = Object.keys(queryParam).map(key => {
71
+ return key + "=" + queryParam[key]
72
+ }).join("&")
73
+
74
+ if (pstr) {
75
+ if (purl.indexOf('.html?') >= 0) {
76
+ eUrl = eUrl + '&' + pstr
77
+ } else {
78
+ eUrl = eUrl + '?' + pstr
79
+ }
80
+ }
81
+
82
+ location.href = eUrl;
83
+ return
84
+ }
85
+
67
86
  delete queryParam.dataId;
68
87
  delete queryParam.showWfContent;
69
88
  delete queryParam.access_token;
@@ -74,7 +93,6 @@ export default {
74
93
  let url = purl + '.vue';
75
94
  this.queryParam = queryParam;
76
95
  this.showWfContent = true;
77
- await this.initI18n();
78
96
  // this.wfContent = require('@/views' + url).default;
79
97
  let t = "@base/views";
80
98
  let urlArr = [
@@ -82,25 +100,34 @@ export default {
82
100
  '/user/form/view/list.vue',
83
101
  '/user/form/view/edit.vue'
84
102
  ]
85
- if (urlArr.includes(url)) {
86
- this.wfContent = require('@base/views' + url).default;
87
- } else if (url.startsWith(t)) {
88
- let path = url.slice(t.length);
89
- this.wfContent = require('@base/views' + path).default;
90
- } else {
91
- this.wfContent = require('@/views' + url).default;
92
- }
93
-
103
+ this.initUserInfo(() => {
104
+ this.initI18n();
105
+ if (urlArr.includes(url)) {
106
+ this.wfContent = require('@base/views' + url).default;
107
+ } else if (url.startsWith(t)) {
108
+ let path = url.slice(t.length);
109
+ this.wfContent = require('@base/views' + path).default;
110
+ } else {
111
+ this.wfContent = require('@/views' + url).default;
112
+ }
113
+ })
114
+ },
115
+ initUserInfo(callback) {
116
+ this.$store
117
+ .dispatch('user/getInfo2')
118
+ .then(() => {
119
+ callback && callback();
120
+ });
94
121
  },
95
122
  getI18nLang() {
96
123
  let i18nLang = this.$route.query.i18nLang || "zh";
97
124
  return i18nLang;
98
125
  },
99
- initI18n() {
126
+ async initI18n() {
100
127
  let lang = this.getI18nLang();
101
128
  this.$i18n.locale = lang // 设置给本地的i18n插件
102
129
  localStorage.setItem("i18n-lang", lang);
103
- return indexUtil.initI18nMessage("business", lang, true);
130
+ await indexUtil.initI18nMessage("business", lang, true);
104
131
  },
105
132
  login() {
106
133
  let token = this.$route.query.access_token;
package/src/views/user/outLink/view.vue CHANGED
@@ -56,17 +56,17 @@ export default {
56
56
  delete queryParam.urlmobile;
57
57
  delete queryParam.url;
58
58
 
59
- if(purl.indexOf('.html')>=0){
59
+ if (purl.indexOf('.html') >= 0) {
60
60
  let eUrl = purl;
61
- let pstr = Object.keys(queryParam).map(key=>{
62
- return key+"="+queryParam[key]
61
+ let pstr = Object.keys(queryParam).map(key => {
62
+ return key + "=" + queryParam[key]
63
63
  }).join("&")
64
64
 
65
- if(pstr){
66
- if(purl.indexOf('.html?')>=0){
67
- eUrl = eUrl+'&'+pstr
68
- }else{
69
- eUrl = eUrl+'?'+pstr
65
+ if (pstr) {
66
+ if (purl.indexOf('.html?') >= 0) {
67
+ eUrl = eUrl + '&' + pstr
68
+ } else {
69
+ eUrl = eUrl + '?' + pstr
70
70
  }
71
71
  }
72
72
 
@@ -81,8 +81,6 @@ export default {
81
81
  delete queryParam.thirdparty_info;
82
82
  delete queryParam.i18nLang;
83
83
 
84
-
85
-
86
84
  let url = purl + '.vue';
87
85
  this.queryParam = queryParam;
88
86
  this.showWfContent = true;
@@ -93,27 +91,34 @@ export default {
93
91
  '/user/form/view/list.vue',
94
92
  '/user/form/view/edit.vue'
95
93
  ]
96
- if (urlArr.includes(url)) {
97
- this.wfContent = require('@base/views' + url).default;
98
- } else if (url.startsWith(t)) {
99
- let path = url.slice(t.length);
100
- this.wfContent = require('@base/views' + path).default;
101
- } else {
102
- this.wfContent = require('@/views' + url).default;
103
- }
104
-
105
- this.initI18n();
106
-
94
+ this.initUserInfo(() => {
95
+ this.initI18n();
96
+ if (urlArr.includes(url)) {
97
+ this.wfContent = require('@base/views' + url).default;
98
+ } else if (url.startsWith(t)) {
99
+ let path = url.slice(t.length);
100
+ this.wfContent = require('@base/views' + path).default;
101
+ } else {
102
+ this.wfContent = require('@/views' + url).default;
103
+ }
104
+ })
105
+ },
106
+ initUserInfo(callback) {
107
+ this.$store
108
+ .dispatch('user/getInfo2')
109
+ .then(() => {
110
+ callback && callback();
111
+ });
107
112
  },
108
113
  getI18nLang() {
109
114
  let i18nLang = this.$route.query.i18nLang || "zh";
110
115
  return i18nLang;
111
116
  },
112
- initI18n() {
117
+ async initI18n() {
113
118
  let lang = this.getI18nLang();
114
119
  this.$i18n.locale = lang // 设置给本地的i18n插件
115
120
  localStorage.setItem("i18n-lang", lang);
116
- indexUtil.initI18nMessage("business", lang, true);
121
+ await indexUtil.initI18nMessage("business", lang, true);
117
122
  },
118
123
  login() {
119
124
  let token = this.$route.query.access_token;