n20-common-lib 1.3.165 → 1.3.166

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.3.165",
3
+ "version": "1.3.166",
4
4
  "private": false,
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -2,7 +2,7 @@
2
2
  <el-dialog v-drag :visible.sync="progressV" :title="title" append-to-body>
3
3
  <template v-if="!hidePercent">
4
4
  <p v-if="!percentType">系统处理中,请稍等......</p>
5
- <div v-else>
5
+ <div v-else>
6
6
  <div class="m-b"><span class="m-r-m">导入文件</span>{{ validateResult.name }}</div>
7
7
  <div class="flex-box w-70p">
8
8
  <div class="m-r-m">导入进度</div>
@@ -10,9 +10,7 @@
10
10
  <el-progress class="m-b" :percentage="percent" :status="percentType" />
11
11
  </div>
12
12
  </div>
13
-
14
13
  </div>
15
-
16
14
  </template>
17
15
  <!-- 错误数据行提示 -->
18
16
  <template v-if="validateResult">
@@ -41,17 +39,35 @@
41
39
  </template>
42
40
  </el-table-column>
43
41
  </el-table>
44
-
45
42
  </div>
46
43
  <div class="color-warning m-t-s">{{ '上述数据输入有误,请修改导入文件中相关信息!' | $lc }}</div>
47
44
  </template>
48
45
  <span slot="footer">
49
46
  <div v-if="footerBtn">
50
- <el-button type="primary" @click="footerBtn.confirm.click">{{ footerBtn.confirm.text | $lc }}</el-button>
51
- <el-button plain @click="footerBtn.cancel.click">{{ footerBtn.cancel.text | $lc }}</el-button>
47
+ <el-button
48
+ type="primary"
49
+ @click="
50
+ () => {
51
+ footerBtn.confirm.click()
52
+ this.progressV = false
53
+ return
54
+ }
55
+ "
56
+ >{{ footerBtn.confirm.text | $lc }}</el-button
57
+ >
58
+ <el-button
59
+ plain
60
+ @click="
61
+ () => {
62
+ footerBtn.cancel.click()
63
+ this.progressV = false
64
+ return
65
+ }
66
+ "
67
+ >{{ footerBtn.cancel.text | $lc }}</el-button
68
+ >
52
69
  </div>
53
- <el-button v-else type="primary" @click="confirmFn">{{ '确认' | $lc }}</el-button>
54
-
70
+ <el-button v-else type="primary" @click="confirmFn">{{ '确认' | $lc }}</el-button>
55
71
  </span>
56
72
  </template>
57
73
  </el-dialog>