From 413f167eacffa8958341bcdcf7bc97d547664868 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 13 5月 2025 06:13:02 +0800
Subject: [PATCH] 高级查询初步

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
index b56f993..eab58b1 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/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/templatedemo_web/src/components/DyFormForHighQuery/DyFormForHighQuery.tsx"
@@ -170,7 +170,7 @@
                 const Component = el
                 const el2 =
                    formItemElementMap['select'];
-                const Component2 = el2
+                const ComponentForHighSelect = el2
                 return Component && !item.isHide ? (
                 
                   <el-form-item
@@ -201,15 +201,21 @@
                   <el-option label="绛変簬" value="2" />
                   <el-option label="涓嶇瓑浜�" value="8" />
                 </el-select>  */}
-                
-                <Component2 style="width:150px;"
+                 {/* 褰撶粍浠剁被鍨嬩笉鏄棩鏈熸帶浠舵椂鏄剧ずComponentForHighSelect */}
+                 {(!itemProps.isDateControl && (
+  // ComponentForHighSelect 鐨勬覆鏌撲唬鐮�
+  <ComponentForHighSelect style="width:150px;"
                    {...itemProps.highSelectAttrs}
-                     modelValue={currentWidgetModel.value(itemProps.highSelectAttrs)}
+                     modelValue={currentWidgetModel.value(itemProps.highSelectAttrs?.prop || '')}
                      onUpdate:modelValue={(val: string | number) =>
-                        onUpdateModelValue(val, itemProps.highSelectAttrs)
+                        onUpdateModelValue(val, itemProps.highSelectAttrs?.prop || '')
                       }>
                   <FormRenderForHighSelectOptions item={itemProps} />
-                </Component2>
+                </ComponentForHighSelect>
+))}
+ {/* 鏃ユ湡鎺т欢鏃剁殑鍗犱綅鍏冪礌 */}
+{itemProps.isDateControl && <span style="width:150px;margin-right:8px;"></span>}
+                
                       &nbsp; 
                     <Component
                       style={{

--
Gitblit v1.9.3