8000 1.0.12.5 优化表格 showOverflowTooltip 字段 · HyperGenm/springboot-vue@7fcce10 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7fcce10

Browse files
author
WeiziPlus
committed
1.0.12.5 优化表格 showOverflowTooltip 字段
1 parent 7cc4a48 commit 7fcce10

File tree

16 files changed

+158
-124
lines changed

16 files changed

+158
-124
lines changed

‎springboot/demo-pc/src/main/java/com/weiziplus/pc/core/system/service/SysFileService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public ResultUtils<List<LogFileVo>> getFile() {
207207
return ResultUtils.errorRole("只有超级管理员才可以查看常用文件");
208208
}
209209
//常用文件存放名字
210-
String mkdirName = "file";
210+
String mkdirName = "template";
211211
//日志文件夹
212212
File baseFile = new File(GlobalConfig.getBaseFilePath() + File.separator + mkdirName);
213213
//获取文件夹下所有文件

‎springboot/demo-pc/src/main/resources/static/file/image/springboot.png renamed to ‎springboot/demo-pc/src/main/resources/static/template/image/springboot.png

File renamed without changes.

‎springboot/demo-pc/src/main/resources/static/file/image/vue.png renamed to ‎springboot/demo-pc/src/main/resources/static/template/image/vue.png

File renamed without changes.

‎springboot/demo-pc/src/main/resources/static/file/test/banner.txt renamed to ‎springboot/demo-pc/src/main/resources/static/template/test/banner.txt

File renamed without changes.

‎vue/src/components/detail/Index.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
:href="row.element(row)['href'] || ''"
3030
:type="row.element(row)['type'] || ''"
3131
:icon="row.element(row)['icon'] || ''"
32-
:underline="row.element(row)['underline'] || false">
32+
:underline="row.element(row)['underline']">
3333
{{row.element(row)['content'] || row.prop}}
3434
</el-link>
3535
</template>
3636
<template v-else-if="'switch' === row.type">
3737
<el-switch :value="row.element(row)['value'] || ''"
38-
:disabled="row.element(row)['disabled'] || false"
38+
:disabled="row.element(row)['disabled']"
3939
:activeColor="row.element(row)['activeColor'] || '#13ce66'"
4040
:inactiveColor="row.element(row)['inactiveColor'] || '#ff4949'"
4141
:activeText="row.element(row)['activeText'] || ''"
@@ -49,7 +49,7 @@
4949
<template v-else-if="'avatar' === row.type">
5050
<div @click="avatarClick(row.element(row)['src'])">
5151
<el-image :src="row.element(row)['src']"
52-
:lazy="row.element(row)['lazy'] || true"
52+
:lazy="!row.element(row)['notLazy']"
5353
:alt="row.element(row)['alt'] || ''"
5454
:fit="row.element(row)['fit'] || 'cover'"
5555
:style="row.element(row)['style'] || 'width:30px;height:30px'">
@@ -126,10 +126,12 @@
126126
<style lang="scss">
127127
#wei-dialog-detail {
128128
overflow: hidden;
129+
129130
.el-row {
130131
color: #666;
131132
margin-bottom: 5px;
132133
}
134+
133135
.label {
134136
font-size: 0.9rem;
135137
background-color: #eee;
@@ -138,6 +140,7 @@
138140
line-height: 35px;
139141
overflow: hidden;
140142
}
143+
141144
.content {
142145
font-size: 0.8rem;
143146
border: 1px solid #e2e2e2;

‎vue/src/components/form/Index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<el-form ref="form" size="mini" :label-width="labelWidth"
4< 103BF /code>4
:model="formData || {}" :rules="formRules || {}">
55
<slot name="itemHead" :formData="formData"></slot>
6-
<div v-for="item in formOptions" :key="item.prop"
7-
v-if="!item['hidden']">
6+
<template v-for="item in formOptions"
7+
v-if="!item['hidden']">
88
<!--一行展示多个-->
99
<template v-if="null != item.items && 0 < item.items.length">
1010
<div style="display: flex;">
@@ -30,7 +30,7 @@
3030
@inputFocus="$emit('inputFocus',{$event,item})"
3131
@selectChange="selectChange"></wei-item>
3232
</template>
33-
</div>
33+
</template>
3434
<slot name="itemTail" :formData="formData"></slot>
3535
</el-form>
3636
<div v-if="showFooterButton" slot="footer">

‎vue/src/components/form/Item.vue

Lines changed: 69 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,73 @@
11
<template>
2-
<div id="index">
3-
<el-form-item :label='item.label' :prop="item.prop" :required="item.required || false">
4-
<template v-if="'input' === item.type">
5-
<el-input v-model="formData[item.prop]" :size="item.size" :type="item.inputType || 'text'"
6-
:placeholder="item.placeholder || item.label || '请输入'" clearable
7-
@focus="$emit('inputFocus',$event)"
8-
:disabled="item.disabled || false"></el-input>
9-
</template>
10-
<template v-else-if="'select' === item.type">
11-
<el-select v-model="formData[item.prop]" :size="item.size"
12-
clearable filterable :disabled="item.disabled || false"
13-
:multiple="item.multiple"
14-
:placeholder="item.placeholder || '请选择'"
15-
@change="selectChange(formData[item.prop],item.prop)">
16-
<el-option v-for="option in item.options" :key="option.value"
17-
:label="option.label" :value="option.value"
18-
:disabled="option.disabled || false"></el-option>
19-
F438 </el-select>
20-
</template>
21-
<template v-else-if="'cascader' === item.type">
22-
<el-cascader v-model="formData[item.prop]" :size="item.size"
23-
clearable filterable :disabled="item.disabled || false"
24-
:placeholder="item.placeholder || '请选择'"
25-
:options="item.options || []"
26-
:props="item['props'] || { checkStrictly: true }"
27-
@change="selectChange(formData[item.prop],item.prop)"></el-cascader>
28-
</template>
29-
<template v-else-if="'radio' === item.type">
30-
<el-radio-group v-model="formData[item.prop]" :size="item.size"
31-
:disabled="item.disabled || false">
32-
<el-radio v-for="option in item.options" :key="option.value"
33-
:label="option.value" :disabled="option.disabled || false">
34-
{{option.label}}
35-
</el-radio>
36-
</el-radio-group>
37-
</template>
38-
<template v-else-if="'textarea' === item.type">
39-
<el-input type="textarea" :size="item.size" v-model="formData[item.prop]"
40-
:disabled="item.disabled || false" autosize></el-input>
41-
</template>
42-
<template v-else-if="'checkbox' === item.type">
43-
<el-checkbox-group v-model="formData[item.prop]" :size="item.size"
44-
:disabled="item.disabled || false">
45-
<el-checkbox v-for="option in options" :key="option.value"
46-
:label="option.value" :disabled="option.disabled || false">{{option.label}}
47-
</el-checkbox>
48-
</el-checkbox-group>
49-
</template>
50-
<template v-else-if="'datePicker' === item.type">
51-
<el-date-picker type="date" :placeholder="item.placeholder || '选择日期'"
52-
v-model="formData[item.prop]" :size="item.size"
53-
:value-format="item.valueFormat || 'yyyy-MM-dd'"
54-
:disabled="item.disabled || false"></el-date-picker>
55-
</template>
56-
<template v-else-if="'timePicker' === item.type">
57-
<el-time-picker :placeholder="item.placeholder || '选择时间'"
58-
v-model="formData[item.prop]" :size="item.size"
59-
:value-format="item.valueFormat || 'HH:mm:ss'"
60-
:disabled="item.disabled || false"></el-time-picker>
61-
</template>
62-
<template v-else-if="'dateTimePicker' === item.type">
63-
<el-date-picker type="datetime" :placeholder="item.placeholder || '选择时间'"
64-
v-model="formData[item.prop]" :size="item.size"
65-
:value-format="item.valueFormat || 'yyyy-MM-dd HH:mm:ss'"
66-
:disabled="item.disabled || false"></el-date-picker>
67-
</template>
68-
<template v-else>
69-
{{item.label}}没有指定type
70-
</template>
71-
</el-form-item>
72-
</div>
2+
<el-form-item :label='item.label' :prop="item.prop" :required="item.required">
3+
<template v-if="'input' === item.type">
4+
<el-input v-model="formData[item.prop]" :size="item.size" :type="item.inputType || 'text'"
5+
:placeholder="item.placeholder || item.label || '请输入'" clearable
6+
@focus="$emit('inputFocus',$event)"
7+
:disabled="item.disabled"></el-input>
8+
</template>
9+
<template v-else-if="'select' === item.type">
10+
<el-select v-model="formData[item.prop]" :size="item.size"
11+
clearable filterable :disabled="item.disabled"
12+
:multiple="item.multiple"
13+
:placeholder="item.placeholder || '请选择'"
14+
@change="selectChange(formData[item.prop],item.prop)">
15+
<el-option v-for="option in item.options" :key="option.value"
16+
:label="option.label" :value="option.value"
17+
:disabled="option.disabled"></el-option>
18+
</el-select>
19+
</template>
20+
<template v-else-if="'cascader' === item.type">
21+
<el-cascader v-model="formData[item.prop]" :size="item.size"
22+
clearable filterable :disabled="item.disabled"
23+
:placeholder="item.placeholder || '请选择'"
24+
:options="item.options || []"
25+
:props="item['props'] || { checkStrictly: true }"
26+
@change="selectChange(formData[item.prop],item.prop)"></el-cascader>
27+
</template>
28+
<template v-else-if="'radio' === item.type">
29+
<el-radio-group v-model="formData[item.prop]" :size="item.size"
30+
:disabled="item.disabled">
31+
<el-radio v-for="option in item.options" :key="option.value"
32+
:label="option.value" :disabled="option.disabled">
33+
{{option.label}}
34+
</el-radio>
35+
</el-radio-group>
36+
</template>
37+
<template v-else-if="'textarea' === item.type">
38+
<el-input type="textarea" :size="item.size" v-model="formData[item.prop]"
39+
:disabled="item.disabled" autosize></el-input>
40+
</template>
41+
<template v-else-if="'checkbox' === item.type">
42+
<el-checkbox-group v-model="formData[item.prop]" :size="item.size"
43+
:disabled="item.disabled">
44+
<el-checkbox v-for="option in options" :key="option.value"
45+
:label="option.value" :disabled="option.disabled">{{option.label}}
46+
</el-checkbox>
47+
</el-checkbox-group>
48+
</template>
49+
<template v-else-if="'datePicker' === item.type">
50+
<el-date-picker type="date" :placeholder="item.placeholder || '选择日期'"
51+
v-model="formData[item.prop]" :size="item.size"
52+
:value-format="item.valueFormat || 'yyyy-MM-dd'"
53+
:disabled="item.disabled"></el-date-picker>
54+
</template>
55+
<template v-else-if="'timePicker' === item.type">
56+
<el-time-picker :placeholder="item.placeholder || '选择时间'"
57+
v-model="formData[item.prop]" :size="item.size"
58+
:value-format="item.valueFormat || 'HH:mm:ss'"
59+
:disabled="item.disabled"></el-time-picker>
60+
</template>
61+
<template v-else-if="'dateTimePicker' === item.type">
62+
<el-date-picker type="datetime" :placeholder="item.placeholder || '选择时间'"
63+
v-model="formData[item.prop]" :size="item.size"
64+
:value-format="item.valueFormat || 'yyyy-MM-dd HH:mm:ss'"
65+
:disabled="item.disabled"></el-date-picker>
66+
</template>
67+
<template v-else>
68+
{{item.label}}没有指定type
69+
</template>
70+
</el-form-item>
7371
</template>
7472

7573
<script>

0 commit comments

Comments
 (0)
0