From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeQueryDrawer模板.txt | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
index edb796f..9ef83ba 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeQueryDrawer\346\250\241\346\235\277.txt"
@@ -14,6 +14,17 @@
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'
+// 引入公共选项配置
+import {
+ FILTER_MODE_OPTIONS_STRING,
+ FILTER_MODE_OPTIONS_NUM,
+ FILTER_MODE_OPTIONS_BOOL
+} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
+// 引入公共表单工具文件
+import { collectFormDataForHighQuery,onResetForHighSelect,onResetForHighQuery } from '@/utils/myformUtils';
+import {
+ BOOLEAN_OPTIONS
+} from '@/utils/commonOptionConstants';
export const use$EntityName$QueryDrawer = (props: any, ctx?: any) => {
const $PageMenuInstanceName$Drawer = injectModel<$EntityName$Drawer>('$EntityName$Drawer')
@@ -75,7 +86,7 @@
},
})
/**
- * 添加的form字段
+ * 高级查询的form字段
*/
const formItems = reactive([
$PageAddFormAttributes_Query$
@@ -90,16 +101,11 @@
const check = isEqual(initiateData.value, data)
return check
}
- const commonGetFormData=()=>{
- const data = {
- $Save_PageAddFormAttributes_Query$
- }
- return data;
- }
+
const onClose = (done: () => void) => {
if (visible.value) {
visible.value = false
- const data =commonGetFormData();
+ const data =collectFormDataForHighQuery(formItems,formData);
ctx.emit('close', data)
}
}
@@ -107,18 +113,22 @@
* 确认查询
*/
const onConfirmQuery = async () => {
- const data =commonGetFormData();
+ const data =collectFormDataForHighQuery(formItems,formData);
ctx.emit('confirmQuery', data)
}
- /**
- * 重置查询
- */
- const onReset = async () => {
- formData.value = {}
- $Save_PageAddFormAttributes_Query_Clear$
- //向父组件发送自定义事件
- ctx.emit('restQuery');
- }
+ /**
+ * 重置查询 - 优化版
+ */
+ const onReset = async () => {
+ // 1. 清空所有基础字段（不包含过滤模式字段）,应用基础字段初始值
+ onResetForHighQuery(formItems,formData);
+
+ // 2. 使用原有方法重置过滤模式字段
+ onResetForHighSelect(formItems,formData);
+
+ // 3. 向父组件发送自定义事件
+ ctx.emit('restQuery');
+ }
const updateCheckData = () => {
initiateData.value = {
@@ -143,6 +153,7 @@
$CommonQueryEnumForFrom$
}
commonQueryEnumForFrom()
+ onResetForHighSelect(formItems,formData);//重置公共select查询
/**
* 弹窗打开获取详情
*/
--
Gitblit v1.9.3