t20-common-lib 0.14.5 → 0.14.7
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
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
:close-on-press-escape="false"
|
|
11
11
|
@close="handleClose"
|
|
12
12
|
>
|
|
13
|
+
<slot name="top" :validateResult="validateResult"></slot>
|
|
13
14
|
<div style="min-height: 28px">
|
|
14
15
|
<template v-if="!hidePercent">
|
|
15
16
|
<p v-if="!percentType">系统处理中，请稍等......</p>
|
|
@@ -30,7 +31,6 @@
|
|
|
30
31
|
</div>
|
|
31
32
|
</div>
|
|
32
33
|
</template>
|
|
33
|
-
<slot name="top" :validateResult="validateResult"></slot>
|
|
34
34
|
<template v-if="validateResult">
|
|
35
35
|
<div class="m-b">
|
|
36
36
|
<span class="m-r">导入统计</span>
|
|
@@ -72,9 +72,6 @@
|
|
|
72
72
|
/>
|
|
73
73
|
</div>
|
|
74
74
|
</div>
|
|
75
|
-
<slot name="error" :validateResult="validateResult">
|
|
76
|
-
<div class="color-warning m-t-s">上述数据输入有误，请修改导入文件中相关信息！</div>
|
|
77
|
-
</slot>
|
|
78
75
|
</template>
|
|
79
76
|
</template>
|
|
80
77
|
</div>
|
|
@@ -198,8 +198,9 @@ export default {
|
|
|
198
198
|
},
|
|
199
199
|
expectedHeaderForColumn(col) {
|
|
200
200
|
const label = String(col.label == null ? '' : col.label).trim()
|
|
201
|
-
const required = col.required === true
|
|
202
|
-
return required ? `* ${label}` : label
|
|
201
|
+
// const required = col.required === true
|
|
202
|
+
// return required ? `* ${label}` : label
|
|
203
|
+
return label
|
|
203
204
|
},
|
|
204
205
|
buildSheetPayload(headers, rows, columnTree) {
|
|
205
206
|
const leafCols = this.flattenLeafColumns(columnTree)
|