cloud-web-corejs 1.0.54-dev.83 → 1.0.54-dev.84
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 +1 -1
- package/src/components/excelExport/mixins.js +1 -2
- package/src/components/xform/form-designer/form-widget/dialog/importDialog.vue +25 -4
- package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js +1 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +1 -1873
- package/src/components/xform/form-render/indexMixin.js +1 -1
- package/src/store/config/index.js +1 -598
- package/src/utils/request.js +1 -1
- package/src/views/user/home/dev.vue +29 -0
- package/src/views/user/home/index.vue +11 -5
- package/src/views/user/user/info.vue +10 -39
- package/src/views/user/user/infoEdit.vue +12 -25
- package/src/views/user/wf/wf_obj_config/list.vue +1 -13
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
</div>
|
|
42
42
|
</div>
|
|
43
43
|
<span slot="footer" class="dialog-footer">
|
|
44
|
-
<span class="fl tips">{{$t1('注：导入文件不允许超过{fileSize}MB',{fileSize:importFileLimitSize})}}</span>
|
|
44
|
+
<span class="fl tips">{{ $t1('注：导入文件不允许超过{fileSize}MB', {fileSize: importFileLimitSize}) }}</span>
|
|
45
45
|
<el-button type="primary" plain class="button-sty" @click="dialogClose1">
|
|
46
46
|
<i class="el-icon-close el-icon"></i>
|
|
47
47
|
{{ $t2('取 消', 'system.button.cancel2') }}
|
|
@@ -67,7 +67,28 @@
|
|
|
67
67
|
v-el-drag-dialog
|
|
68
68
|
>
|
|
69
69
|
<div>
|
|
70
|
-
<div
|
|
70
|
+
<div v-show="importLoading" class="import-stepbox">
|
|
71
|
+
<ul>
|
|
72
|
+
<li :class="getLoadingClass(1,percent1)">
|
|
73
|
+
<i class="el-icon-circle-check"></i>
|
|
74
|
+
<i class="el-icon-loading"></i>
|
|
75
|
+
<span v-html="$t1('上传导入文件 {percent}', {percent: `<span class=nums>${percent1}%</span>`})"></span>
|
|
76
|
+
</li>
|
|
77
|
+
<li :class="getLoadingClass(2,percent2)">
|
|
78
|
+
<i class="el-icon-circle-check"></i>
|
|
79
|
+
<i class="el-icon-loading"></i>
|
|
80
|
+
<span
|
|
81
|
+
v-html="$t1('校验导入文件中的图片数据格式 {percent}', {percent: `<span class=nums>${percent2}%</span>`})"></span>
|
|
82
|
+
</li>
|
|
83
|
+
<li :class="getLoadingClass(3,percent3)">
|
|
84
|
+
<i class="el-icon-circle-check"></i>
|
|
85
|
+
<i class="el-icon-loading"></i>
|
|
86
|
+
<span
|
|
87
|
+
v-html="$t1('存储导入文件中的图片 {percent}', {percent: `<span class=nums>${percent3}%</span>`})"></span>
|
|
88
|
+
</li>
|
|
89
|
+
</ul>
|
|
90
|
+
</div>
|
|
91
|
+
<div v-show="!importLoading" class="import-box" style="margin-bottom: 30px;">
|
|
71
92
|
<div class="tips">
|
|
72
93
|
{{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
|
|
73
94
|
<!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
|
|
@@ -89,7 +110,7 @@
|
|
|
89
110
|
</div>
|
|
90
111
|
</div>
|
|
91
112
|
<div slot="footer" class="dialog-footer" center="true">
|
|
92
|
-
<div class="fl import-count">
|
|
113
|
+
<div class="fl import-count" v-show="!importLoading">
|
|
93
114
|
<span class="f-red doneNum">0</span>
|
|
94
115
|
/
|
|
95
116
|
<span class="dataSize">0</span>
|
|
@@ -143,7 +164,7 @@
|
|
|
143
164
|
rows: row[column.field],
|
|
144
165
|
showViewButton: true,
|
|
145
166
|
edit:false
|
|
146
|
-
}"
|
|
167
|
+
}"/>
|
|
147
168
|
</template>
|
|
148
169
|
</vxe-grid>
|
|
149
170
|
</div>
|