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-tree.vue.vm | 237 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 120 insertions(+), 117 deletions(-)
diff --git a/src/main/resources/vm/vue/v3/index-tree.vue.vm b/src/main/resources/vm/vue/v3/index-tree.vue.vm
index ae74ae1..92e1f34 100644
--- a/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/src/main/resources/vm/vue/v3/index-tree.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,13 +33,13 @@
</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"
@@ -48,11 +47,9 @@
</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,19 +72,27 @@
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">
+ <el-button
+ type="info"
+ plain
+ icon="Sort"
+ @click="toggleExpandAll"
+ >灞曞紑/鎶樺彔</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
+ v-if="refreshTable"
v-loading="loading"
:data="${businessName}List"
row-key="${treeCode}"
- default-expand-all
+ :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
#foreach($column in $columns)
@@ -131,27 +136,9 @@
#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="Plus"
- @click="handleAdd(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:add']"
- >鏂板</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="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">鏂板</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>
@@ -172,11 +159,13 @@
#set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode)
<el-form-item label="${comment}" prop="${treeParentCode}">
- <tree-select
- v-model:value="form.${treeParentCode}"
- :options="${businessName}Options"
- :objMap="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+ <el-tree-select
+ v-model="form.${treeParentCode}"
+ :data="${businessName}Options"
+ :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+ value-key="${treeCode}"
placeholder="璇烽�夋嫨${comment}"
+ check-strictly
/>
</el-form-item>
#elseif($column.htmlType == "input")
@@ -184,11 +173,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")
@@ -202,8 +191,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>
@@ -214,7 +206,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}"
@@ -225,31 +217,34 @@
</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"
@@ -276,24 +271,26 @@
</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}Options = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const title = ref("");
+const ${businessName}List = ref([])
+const ${businessName}Options = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const title = ref("")
+const isExpandAll = ref(true)
+const refreshTable = ref(true)
#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
@@ -316,21 +313,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
@@ -338,53 +335,50 @@
#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 = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
- loading.value = false;
- });
+ ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+ loading.value = false
+ })
}
/** 鏌ヨ${functionName}涓嬫媺鏍戠粨鏋� */
-async function getTreeselect() {
- await list${BusinessName}().then(response => {
- ${businessName}Options.value = [];
- const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] };
- data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
- ${businessName}Options.value.push(data);
- });
+function getTreeselect() {
+ list${BusinessName}().then(response => {
+ ${businessName}Options.value = []
+ const data = { ${treeCode}: 0, ${treeName}: '椤剁骇鑺傜偣', children: [] }
+ data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+ ${businessName}Options.value.push(data)
+ })
}
// 鍙栨秷鎸夐挳
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
- };
- proxy.resetForm("${businessName}Ref");
+ }
+ proxy.resetForm("${businessName}Ref")
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
- getList();
+ getList()
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -392,43 +386,52 @@
#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()
}
/** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd(row) {
- reset();
- await getTreeselect();
+function handleAdd(row) {
+ reset()
+ getTreeselect()
if (row != null && row.${treeCode}) {
- form.value.${treeParentCode} = row.${treeCode};
+ form.value.${treeParentCode} = row.${treeCode}
} else {
- form.value.${treeParentCode} = 0;
+ form.value.${treeParentCode} = 0
}
- open.value = true;
- title.value = "娣诲姞${functionName}";
+ open.value = true
+ title.value = "娣诲姞${functionName}"
+}
+
+/** 灞曞紑/鎶樺彔鎿嶄綔 */
+function toggleExpandAll() {
+ refreshTable.value = false
+ isExpandAll.value = !isExpandAll.value
+ nextTick(() => {
+ refreshTable.value = true
+ })
}
/** 淇敼鎸夐挳鎿嶄綔 */
async function handleUpdate(row) {
- reset();
- await getTreeselect();
+ reset()
+ await getTreeselect()
if (row != null) {
- form.value.${treeParentCode} = row.${treeCode};
+ form.value.${treeParentCode} = row.${treeParentCode}
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- form.value = response.data;
+ 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
- open.value = true;
- title.value = "淇敼${functionName}";
- });
+ open.value = true
+ title.value = "淇敼${functionName}"
+ })
}
/** 鎻愪氦鎸夐挳 */
@@ -437,35 +440,35 @@
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 (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) {
proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + row.${pkColumn.javaField} + '"鐨勬暟鎹」锛�').then(function() {
- return del${BusinessName}(row.${pkColumn.javaField});
+ return del${BusinessName}(row.${pkColumn.javaField})
}).then(() => {
- getList();
- proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ getList()
+ proxy.#[[$modal]]#.msgSuccess("鍒犻櫎鎴愬姛")
+ }).catch(() => {})
}
-getList();
+getList()
</script>
--
Gitblit v1.9.3