From d3db9ff6777925153e9bd952faff89895b639689 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期日, 27 四月 2025 10:05:01 +0800 Subject: [PATCH] remove all semicolons --- src/main/resources/vm/vue/v3/index.vue.vm | 277 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 147 insertions(+), 130 deletions(-) diff --git a/src/main/resources/vm/vue/v3/index.vue.vm b/src/main/resources/vm/vue/v3/index.vue.vm index b215034..47eedb8 100644 --- a/src/main/resources/vm/vue/v3/index.vue.vm +++ b/src/main/resources/vm/vue/v3/index.vue.vm @@ -17,13 +17,12 @@ v-model="queryParams.${column.javaField}" placeholder="璇疯緭鍏�${comment}" clearable - size="small" @keyup.enter="handleQuery" /> </el-form-item> #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType) <el-form-item label="${comment}" prop="${column.javaField}"> - <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small"> + <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable> <el-option v-for="dict in ${dictType}" :key="dict.value" @@ -34,25 +33,23 @@ </el-form-item> #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType) <el-form-item label="${comment}" prop="${column.javaField}"> - <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable size="small"> + <el-select v-model="queryParams.${column.javaField}" placeholder="璇烽�夋嫨${comment}" clearable> <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" /> </el-select> </el-form-item> #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") <el-form-item label="${comment}" prop="${column.javaField}"> - <el-date-picker clearable size="small" + <el-date-picker clearable v-model="queryParams.${column.javaField}" type="date" value-format="YYYY-MM-DD" - placeholder="閫夋嫨${comment}"> + placeholder="璇烽�夋嫨${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - <el-form-item label="${comment}"> + <el-form-item label="${comment}" style="width: 308px"> <el-date-picker v-model="daterange${AttrName}" - size="small" - style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" @@ -64,8 +61,8 @@ #end #end <el-form-item> - <el-button type="primary" icon="Search" size="mini" @click="handleQuery">鎼滅储</el-button> - <el-button icon="Refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> + <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button> + <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button> </el-form-item> </el-form> @@ -75,9 +72,8 @@ type="primary" plain icon="Plus" - size="mini" @click="handleAdd" - v-hasPermi="['${moduleName}:${businessName}:add']" + v-hasPermi="['${permissionPrefix}:add']" >鏂板</el-button> </el-col> <el-col :span="1.5"> @@ -85,10 +81,9 @@ type="success" plain icon="Edit" - size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['${moduleName}:${businessName}:edit']" + v-hasPermi="['${permissionPrefix}:edit']" >淇敼</el-button> </el-col> <el-col :span="1.5"> @@ -96,10 +91,9 @@ type="danger" plain icon="Delete" - size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['${moduleName}:${businessName}:remove']" + v-hasPermi="['${permissionPrefix}:remove']" >鍒犻櫎</el-button> </el-col> <el-col :span="1.5"> @@ -107,9 +101,8 @@ type="warning" plain icon="Download" - size="mini" @click="handleExport" - v-hasPermi="['${moduleName}:${businessName}:export']" + v-hasPermi="['${permissionPrefix}:export']" >瀵煎嚭</el-button> </el-col> <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> @@ -155,20 +148,8 @@ #end <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> <template #default="scope"> - <el-button - size="mini" - type="text" - icon="Edit" - @click="handleUpdate(scope.row)" - v-hasPermi="['${moduleName}:${businessName}:edit']" - >淇敼</el-button> - <el-button - size="mini" - type="text" - icon="Delete" - @click="handleDelete(scope.row)" - v-hasPermi="['${moduleName}:${businessName}:remove']" - >鍒犻櫎</el-button> + <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">淇敼</el-button> + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">鍒犻櫎</el-button> </template> </el-table-column> </el-table> @@ -176,8 +157,8 @@ <pagination v-show="total>0" :total="total" - v-model:p:page="queryParams.pageNum" - v-model:p:limit="queryParams.pageSize" + v-model:page="queryParams.pageNum" + v-model:limit="queryParams.pageSize" @pagination="getList" /> @@ -200,11 +181,11 @@ <el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" /> </el-form-item> #elseif($column.htmlType == "imageUpload") - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <image-upload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "fileUpload") - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <file-upload v-model="form.${field}"/> </el-form-item> #elseif($column.htmlType == "editor") @@ -218,8 +199,11 @@ v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" - #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.value)"#else:value="dict.value"#end - +#if($column.javaType == "Integer" || $column.javaType == "Long") + :value="parseInt(dict.value)" +#else + :value="dict.value" +#end ></el-option> </el-select> </el-form-item> @@ -230,7 +214,7 @@ </el-select> </el-form-item> #elseif($column.htmlType == "checkbox" && "" != $dictType) - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <el-checkbox-group v-model="form.${field}"> <el-checkbox v-for="dict in ${dictType}" @@ -241,35 +225,38 @@ </el-checkbox-group> </el-form-item> #elseif($column.htmlType == "checkbox" && $dictType) - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <el-checkbox-group v-model="form.${field}"> <el-checkbox>璇烽�夋嫨瀛楀吀鐢熸垚</el-checkbox> </el-checkbox-group> </el-form-item> #elseif($column.htmlType == "radio" && "" != $dictType) - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <el-radio-group v-model="form.${field}"> <el-radio v-for="dict in ${dictType}" :key="dict.value" - #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.value)"#else:label="dict.value"#end - +#if($column.javaType == "Integer" || $column.javaType == "Long") + :label="parseInt(dict.value)" +#else + :label="dict.value" +#end >{{dict.label}}</el-radio> </el-radio-group> </el-form-item> #elseif($column.htmlType == "radio" && $dictType) - <el-form-item label="${comment}"> + <el-form-item label="${comment}" prop="${field}"> <el-radio-group v-model="form.${field}"> <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio> </el-radio-group> </el-form-item> #elseif($column.htmlType == "datetime") <el-form-item label="${comment}" prop="${field}"> - <el-date-picker clearable size="small" + <el-date-picker clearable v-model="form.${field}" type="date" value-format="YYYY-MM-DD" - placeholder="閫夋嫨${comment}"> + placeholder="璇烽�夋嫨${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "textarea") @@ -284,10 +271,10 @@ <el-divider content-position="center">${subTable.functionName}淇℃伅</el-divider> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" icon="Plus" size="mini" @click="handleAdd${subClassName}">娣诲姞</el-button> + <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">娣诲姞</el-button> </el-col> <el-col :span="1.5"> - <el-button type="danger" icon="Delete" size="mini" @click="handleDelete${subClassName}">鍒犻櫎</el-button> + <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">鍒犻櫎</el-button> </el-col> </el-row> <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}"> @@ -302,10 +289,42 @@ #set($comment=$column.columnComment) #end #if($column.pk || $javaField == ${subTableFkclassName}) -#elseif($column.list && "" != $javaField) - <el-table-column label="$comment" prop="${javaField}"> +#elseif($column.list && $column.htmlType == "input") + <el-table-column label="$comment" prop="${javaField}" width="150"> <template #default="scope"> <el-input v-model="scope.row.$javaField" placeholder="璇疯緭鍏�$comment" /> + </template> + </el-table-column> +#elseif($column.list && $column.htmlType == "datetime") + <el-table-column label="$comment" prop="${javaField}" width="240"> + <template #default="scope"> + <el-date-picker clearable + v-model="scope.row.$javaField" + type="date" + value-format="YYYY-MM-DD" + placeholder="璇烽�夋嫨$comment"> + </el-date-picker> + </template> + </el-table-column> +#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) + <el-table-column label="$comment" prop="${javaField}" width="150"> + <template #default="scope"> + <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment"> + <el-option + v-for="dict in $column.dictType" + :key="dict.value" + :label="dict.label" + :value="dict.value" + ></el-option> + </el-select> + </template> + </el-table-column> +#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) + <el-table-column label="$comment" prop="${javaField}" width="150"> + <template #default="scope"> + <el-select v-model="scope.row.$javaField" placeholder="璇烽�夋嫨$comment"> + <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" /> + </el-select> </template> </el-table-column> #end @@ -324,33 +343,33 @@ </template> <script setup name="${BusinessName}"> -import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"; +import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}" -const { proxy } = getCurrentInstance(); +const { proxy } = getCurrentInstance() #if(${dicts} != '') #set($dictsNoSymbol=$dicts.replace("'", "")) -const { ${dictsNoSymbol} } = proxy.useDict(${dicts}); +const { ${dictsNoSymbol} } = proxy.useDict(${dicts}) #end -const ${businessName}List = ref([]); +const ${businessName}List = ref([]) #if($table.sub) -const ${subclassName}List = ref([]); +const ${subclassName}List = ref([]) #end -const open = ref(false); -const loading = ref(true); -const showSearch = ref(true); -const ids = ref([]); +const open = ref(false) +const loading = ref(true) +const showSearch = ref(true) +const ids = ref([]) #if($table.sub) -const checked${subClassName} = ref([]); +const checked${subClassName} = ref([]) #end -const single = ref(true); -const multiple = ref(true); -const total = ref(0); -const title = ref(""); +const single = ref(true) +const multiple = ref(true) +const total = ref(0) +const title = ref("") #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -const daterange${AttrName} = ref([]); +const daterange${AttrName} = ref([]) #end #end @@ -375,21 +394,21 @@ #set($comment=$column.columnComment) #end $column.javaField: [ - { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } + { required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end } ]#if($foreach.count != $columns.size()),#end #end #end } -}); +}) -const { queryParams, form, rules } = toRefs(data); +const { queryParams, form, rules } = toRefs(data) /** 鏌ヨ${functionName}鍒楄〃 */ function getList() { - loading.value = true; + loading.value = true #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") - queryParams.value.params = {}; + queryParams.value.params = {} #break #end #end @@ -397,47 +416,45 @@ #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) if (null != daterange${AttrName} && '' != daterange${AttrName}) { - queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]; - queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]; + queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0] + queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1] } #end #end list${BusinessName}(queryParams.value).then(response => { - ${businessName}List.value = response.rows; - total.value = response.total; - loading.value = false; - }); + ${businessName}List.value = response.rows + total.value = response.total + loading.value = false + }) } // 鍙栨秷鎸夐挳 function cancel() { - open.value = false; - reset(); + open.value = false + reset() } // 琛ㄥ崟閲嶇疆 function reset() { form.value = { #foreach ($column in $columns) -#if($column.htmlType == "radio") - $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($foreach.count != $columns.size()),#end -#elseif($column.htmlType == "checkbox") +#if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else $column.javaField: null#if($foreach.count != $columns.size()),#end #end #end - }; + } #if($table.sub) - ${subclassName}List.value = []; + ${subclassName}List.value = [] #end - proxy.resetForm("${businessName}Ref"); + proxy.resetForm("${businessName}Ref") } /** 鎼滅储鎸夐挳鎿嶄綔 */ function handleQuery() { - queryParams.value.pageNum = 1; - getList(); + queryParams.value.pageNum = 1 + getList() } /** 閲嶇疆鎸夐挳鎿嶄綔 */ @@ -445,44 +462,44 @@ #foreach ($column in $columns) #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) - daterange${AttrName}.value = []; + daterange${AttrName}.value = [] #end #end - proxy.resetForm("queryRef"); - handleQuery(); + proxy.resetForm("queryRef") + handleQuery() } // 澶氶�夋閫変腑鏁版嵁 function handleSelectionChange(selection) { - ids.value = selection.map(item => item.${pkColumn.javaField}); - single.value = selection.length != 1; - multiple.value = !selection.length; + ids.value = selection.map(item => item.${pkColumn.javaField}) + single.value = selection.length != 1 + multiple.value = !selection.length } /** 鏂板鎸夐挳鎿嶄綔 */ function handleAdd() { - reset(); - open.value = true; - title.value = "娣诲姞${functionName}"; + reset() + open.value = true + title.value = "娣诲姞${functionName}" } /** 淇敼鎸夐挳鎿嶄綔 */ function handleUpdate(row) { - reset(); - const ${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value - get${BusinessName}(${pkColumn.javaField}).then(response => { - form.value = response.data; + reset() + const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value + get${BusinessName}(_${pkColumn.javaField}).then(response => { + form.value = response.data #foreach ($column in $columns) #if($column.htmlType == "checkbox") - form.value.$column.javaField = form.value.${column.javaField}.split(","); + form.value.$column.javaField = form.value.${column.javaField}.split(",") #end #end #if($table.sub) - ${subclassName}List.value = response.data.${subclassName}List; + ${subclassName}List.value = response.data.${subclassName}List #end - open.value = true; - title.value = "淇敼${functionName}"; - }); + open.value = true + title.value = "淇敼${functionName}" + }) } /** 鎻愪氦鎸夐挳 */ @@ -491,68 +508,68 @@ if (valid) { #foreach ($column in $columns) #if($column.htmlType == "checkbox") - form.value.$column.javaField = form.value.${column.javaField}.join(","); + form.value.$column.javaField = form.value.${column.javaField}.join(",") #end #end #if($table.sub) - form.value.${subclassName}List = ${subclassName}List.value; + form.value.${subclassName}List = ${subclassName}List.value #end if (form.value.${pkColumn.javaField} != null) { update${BusinessName}(form.value).then(response => { - proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛"); - open.value = false; - getList(); - }); + proxy.#[[$modal]]#.msgSuccess("淇敼鎴愬姛") + open.value = false + getList() + }) } else { add${BusinessName}(form.value).then(response => { - proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛"); - open.value = false; - getList(); - }); + proxy.#[[$modal]]#.msgSuccess("鏂板鎴愬姛") + open.value = false + getList() + }) } } - }); + }) } /** 鍒犻櫎鎸夐挳鎿嶄綔 */ function handleDelete(row) { - const ${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value; - proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() { - return del${BusinessName}(${pkColumn.javaField}s); + const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value + proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + _${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() { + return del${BusinessName}(_${pkColumn.javaField}s) }).then(() => { - getList(); - proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => {}); + getList() + proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛") + }).catch(() => {}) } #if($table.sub) /** ${subTable.functionName}搴忓彿 */ function row${subClassName}Index({ row, rowIndex }) { - row.index = rowIndex + 1; + row.index = rowIndex + 1 } /** ${subTable.functionName}娣诲姞鎸夐挳鎿嶄綔 */ function handleAdd${subClassName}() { - let obj = {}; + let obj = {} #foreach($column in $subTable.columns) #if($column.pk || $column.javaField == ${subTableFkclassName}) #elseif($column.list && "" != $javaField) - obj.$column.javaField = ""; + obj.$column.javaField = "" #end #end - ${subclassName}List.value.push(obj); + ${subclassName}List.value.push(obj) } /** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */ function handleDelete${subClassName}() { if (checked${subClassName}.value.length == 0) { - proxy.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁"); + proxy.#[[$modal]]#.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁") } else { - const ${subclassName}s = ${subclassName}List.value; - const checked${subClassName}s = checked${subClassName}.value; + const ${subclassName}s = ${subclassName}List.value + const checked${subClassName}s = checked${subClassName}.value ${subclassName}List.value = ${subclassName}s.filter(function(item) { return checked${subClassName}s.indexOf(item.index) == -1 - }); + }) } } @@ -569,5 +586,5 @@ }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`) } -getList(); +getList() </script> -- Gitblit v1.9.3