Skip to content

Commit 6bf848d

Browse files
author
piexlMax(奇淼
committed
style: 统一使用!前缀替代方括号的宽度类名
修改模板文件中的宽度类名,从w-[380px]和w-40统一改为!w-380px和!w-40 修复模板中条件判断的语法格式问题
1 parent daabca4 commit 6bf848d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

server/resource/package/web/view/table.vue.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ getDataSourceFunc()
110110

111111
<el-date-picker
112112
v-model="searchInfo.createdAtRange"
113-
class="w-[380px]"
113+
class="!w-380px"
114114
type="datetimerange"
115115
range-separator=""
116116
start-placeholder="开始时间"
@@ -161,7 +161,7 @@ getDataSourceFunc()
161161
>
162162
<el-table-column type="selection" width="55" />
163163
{{ if .GvaModel }}
164-
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
164+
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{ if .IsTree -}} min-{{- end -}}width="180">
165165
<template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
166166
</el-table-column>
167167
{{ end }}

server/resource/plugin/web/view/view.vue.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ getDataSourceFunc()
108108
</template>
109109
<el-date-picker
110110
v-model="searchInfo.createdAtRange"
111-
class="w-[380px]"
111+
class="!w-380px"
112112
type="datetimerange"
113113
range-separator=""
114114
start-placeholder="开始时间"
@@ -158,7 +158,7 @@ getDataSourceFunc()
158158
>
159159
<el-table-column type="selection" width="55" />
160160
{{ if .GvaModel }}
161-
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
161+
<el-table-column sortable align="left" label="日期" prop="CreatedAt" {{ if .IsTree -}} min-{{- end -}}width="180">
162162
<template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
163163
</el-table-column>
164164
{{ end }}

server/utils/autocode/template_funcs.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,11 +242,11 @@ func GenerateSearchFormItem(field systemReq.AutoCodeField) string {
242242
`
243243
} else if field.FieldType == "float64" || field.FieldType == "int" {
244244
if field.FieldSearchType == "BETWEEN" || field.FieldSearchType == "NOT BETWEEN" {
245-
result += fmt.Sprintf(` <el-input class="w-40" v-model.number="searchInfo.start%s" placeholder="最小值" />
245+
result += fmt.Sprintf(` <el-input class="!w-40" v-model.number="searchInfo.start%s" placeholder="最小值" />
246246
`, field.FieldName)
247247
result += ` —
248248
`
249-
result += fmt.Sprintf(` <el-input class="w-40" v-model.number="searchInfo.end%s" placeholder="最大值" />
249+
result += fmt.Sprintf(` <el-input class="!w-40" v-model.number="searchInfo.end%s" placeholder="最大值" />
250250
`, field.FieldName)
251251
} else {
252252
result += fmt.Sprintf(` <el-input v-model.number="searchInfo.%s" placeholder="搜索条件" />
@@ -270,7 +270,7 @@ func GenerateSearchFormItem(field systemReq.AutoCodeField) string {
270270
`
271271
result += ` </template>
272272
`
273-
result += fmt.Sprintf(`<el-date-picker class="w-[380px]" v-model="searchInfo.%sRange" type="datetimerange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>`, field.FieldJson)
273+
result += fmt.Sprintf(`<el-date-picker class="!w-380px" v-model="searchInfo.%sRange" type="datetimerange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>`, field.FieldJson)
274274
} else {
275275
result += fmt.Sprintf(`<el-date-picker v-model="searchInfo.%s" type="datetime" placeholder="搜索条件"></el-date-picker>`, field.FieldJson)
276276
}

0 commit comments

Comments
 (0)