n20-common-lib 1.2.12 → 1.2.15

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "1.2.12",
3
+ "version": "1.2.15",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -117,7 +117,8 @@ $--input-max: 304px;
117
117
  .el-form.label-width-6em {
118
118
  margin-left: 96px;
119
119
  margin-right: 14px;
120
- .n20-title {
120
+ .n20-title,
121
+ .n20-in-block {
121
122
  margin-left: -96px;
122
123
  margin-right: -14px;
123
124
  }
@@ -154,7 +155,8 @@ $--input-max: 304px;
154
155
  .el-form.label-width-8em {
155
156
  margin-left: 66px;
156
157
  margin-right: 38px;
157
- .n20-title {
158
+ .n20-title,
159
+ .n20-in-block {
158
160
  margin-left: -66px;
159
161
  margin-right: -38px;
160
162
  }
@@ -191,7 +193,8 @@ $--input-max: 304px;
191
193
  .el-form.label-width-10em {
192
194
  margin-left: 40px;
193
195
  margin-right: 70px;
194
- .n20-title {
196
+ .n20-title,
197
+ .n20-in-block {
195
198
  margin-left: -40px;
196
199
  margin-right: -70px;
197
200
  }
@@ -228,7 +231,8 @@ $--input-max: 304px;
228
231
  .el-form.label-width-12em {
229
232
  margin-left: 10px;
230
233
  margin-right: 96px;
231
- .n20-title {
234
+ .n20-title,
235
+ .n20-in-block {
232
236
  margin-left: -10px;
233
237
  margin-right: -96px;
234
238
  }
@@ -265,7 +269,8 @@ $--input-max: 304px;
265
269
  .el-form.label-width-14em {
266
270
  margin-left: 0px;
267
271
  margin-right: 96px;
268
- .n20-title {
272
+ .n20-title,
273
+ .n20-in-block {
269
274
  margin-left: 0px;
270
275
  margin-right: -96px;
271
276
  }
@@ -302,7 +307,8 @@ $--input-max: 304px;
302
307
  .el-form.label-width-16em {
303
308
  margin-left: 0px;
304
309
  margin-right: 98px;
305
- .n20-title {
310
+ .n20-title,
311
+ .n20-in-block {
306
312
  margin-left: 0px;
307
313
  margin-right: -96px;
308
314
  }
@@ -46,7 +46,7 @@ export default {
46
46
  },
47
47
  waitTime: {
48
48
  type: Number,
49
- default: 10000
49
+ default: 5000
50
50
  }
51
51
  },
52
52
  data() {
@@ -128,6 +128,10 @@ export default {
128
128
 
129
129
  downloadBlob(data, this.fileName)
130
130
  this.pgsV = false
131
+ let confirmBtn = document.querySelector(
132
+ '.ex-waitime-msg .el-button--primary'
133
+ )
134
+ confirmBtn && confirmBtn.click()
131
135
  })
132
136
  },
133
137
  // 导出取消
@@ -159,7 +163,7 @@ export default {
159
163
  title: '提示',
160
164
  message: '您的数据导出时间可能会比较长,是否继续导出?',
161
165
  type: 'warning',
162
- customClass: 'question',
166
+ customClass: 'question ex-waitime-msg',
163
167
  confirmButtonText: '继续导出',
164
168
  cancelButtonText: '取消'
165
169
  }).catch(() => {
@@ -1,6 +1,6 @@
1
1
  import forEachs from './forEachs'
2
2
 
3
- const name = process.env.VUE_APP_NAME
3
+ const name = process.env.VUE_APP_RelaAppNo || process.env.VUE_APP_NAME
4
4
 
5
5
  let relaObj = {
6
6
  appNo: name,