alis
/
alis-ruoyi-up
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!397 fix issues I7HWO0

Browse Source 
Merge pull request !397 from ahaos/5.X
feature/model
疯狂的狮子Li 1 year ago committed by Gitee
parent 9a53ed796b 66540b5e56
commit 27090fe116
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File

7
ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm
Unescape Escape View File

@ -29,6 +29,10 @@ export interface ${BusinessName}Form extends BaseEntity {
}
export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
/**
* 日期范围参数
*/
params?: any;
#foreach ($column in $columns)
#if($column.query)
/**
@ -42,3 +46,6 @@ export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
#end
#end
}

39
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
Unescape Escape View File

@ -46,7 +46,7 @@
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
<el-form-item label="${comment}" style="width: 308px">
<el-date-picker
v-model="daterange${AttrName}"
v-model="dateRange${AttrName}"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
@ -268,9 +268,6 @@
<script setup name="${BusinessName}" lang="ts">
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
import { ComponentInternalInstance } from 'vue';
import { ElForm, ElTable } from 'element-plus';
type ${BusinessName}Option = {
${treeCode}: number;
@ -292,9 +289,9 @@ const showSearch = ref(true);
const isExpandAll = ref(true);
const loading = ref(false);
const queryFormRef = ref(ElForm);
const ${businessName}FormRef = ref(ElForm);
const ${businessName}TableRef = ref(ElTable)
const queryFormRef = ref<ElFormInstance>();
const ${businessName}FormRef = ref<ElFormInstance>();
const ${businessName}TableRef = ref<ElTableInstance>()
const dialog = reactive<DialogOption>({
visible: false,
@ -304,7 +301,7 @@ const dialog = reactive<DialogOption>({
#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<[DateModelType, DateModelType]>(['', '']);
#end
#end
@ -325,9 +322,20 @@ const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
queryParams: {
#foreach ($column in $columns)
#if($column.query)
#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
$column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
#end
params: {
#foreach ($column in $columns)
#if($column.query)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
$column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
#end
}
},
rules: {
#foreach ($column in $columns)
@ -362,10 +370,7 @@ const getList = async () => {
#foreach ($column in $columns)
#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];
}
proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
#end
#end
const res = await list${BusinessName}(queryParams.value);
@ -394,7 +399,7 @@ const cancel = () => {
// 表单重置
const reset = () => {
form.value = {...initFormData}
${businessName}FormRef.value.resetFields();
${businessName}FormRef.value?.resetFields();
}
/** 搜索按钮操作 */
@ -407,10 +412,10 @@ const resetQuery = () => {
#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
queryFormRef.value.resetFields();
queryFormRef.value?.resetFields();
handleQuery();
}
@ -438,7 +443,7 @@ const handleToggleExpandAll = () => {
/** 展开/折叠操作 */
const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
data.forEach((item) => {
${businessName}TableRef.value.toggleRowExpansion(item, status)
${businessName}TableRef.value?.toggleRowExpansion(item, status)
if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
})
}
@ -467,7 +472,7 @@ const handleUpdate = (row: ${BusinessName}VO) => {
/** 提交按钮 */
const submitForm = () => {
${businessName}FormRef.value.validate(async (valid: boolean) => {
${businessName}FormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
#foreach ($column in $columns)

34
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
Unescape Escape View File

@ -46,7 +46,7 @@
#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
<el-form-item label="${comment}" style="width: 308px">
<el-date-picker
v-model="daterange${AttrName}"
v-model="dateRange${AttrName}"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
@ -260,8 +260,6 @@
<script setup name="${BusinessName}" lang="ts">
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
#if(${dicts} != '')
@ -280,12 +278,12 @@ const total = ref(0);
#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<[DateModelType, DateModelType]>(['', '']);
#end
#end
const queryFormRef = ref(ElForm);
const ${businessName}FormRef = ref(ElForm);
const queryFormRef = ref<ElFormInstance>();
const ${businessName}FormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
@ -310,9 +308,20 @@ const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
pageSize: 10,
#foreach ($column in $columns)
#if($column.query)
#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
$column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
#end
params: {
#foreach ($column in $columns)
#if($column.query)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
$column.javaField: undefined#if($foreach.count != $columns.size()),#end
#end
#end
#end
}
},
rules: {
#foreach ($column in $columns)
@ -347,10 +356,7 @@ const getList = async () => {
#foreach ($column in $columns)
#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];
}
proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
#end
#end
const res = await list${BusinessName}(queryParams.value);
@ -368,7 +374,7 @@ const cancel = () => {
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
${businessName}FormRef.value.resetFields();
${businessName}FormRef.value?.resetFields();
}
/** 搜索按钮操作 */
@ -382,10 +388,10 @@ const resetQuery = () => {
#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
queryFormRef.value.resetFields();
queryFormRef.value?.resetFields();
handleQuery();
}
@ -426,7 +432,7 @@ const handleUpdate = (row?: ${BusinessName}VO) => {
/** 提交按钮 */
const submitForm = () => {
${businessName}FormRef.value.validate(async (valid: boolean) => {
${businessName}FormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
#foreach ($column in $columns)

Write Preview
Loading…
Cancel
Save