From 496f78c085e7f8c5ba261835f9b8bda99c25b4cb Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 13:29:12 +0800
Subject: [PATCH] 增加 字符串类查询(关键字查询专用)
---
Weben_CMS专用代码生成器/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass模板.txt | 6 +-
PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx | 6 +-
PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx | 6 +-
PipeLineLems/pipelinelems_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js | 16 +++++--
CommonDLL/公共前端组件/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js | 16 +++++--
HIAWms/hiawms_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js | 16 +++++--
6 files changed, 42 insertions(+), 24 deletions(-)
diff --git "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js" "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js"
index e70f08b..5c8ca3d 100644
--- "a/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js"
+++ "b/CommonDLL/\345\205\254\345\205\261\345\211\215\347\253\257\347\273\204\344\273\266/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js"
@@ -2,8 +2,14 @@
export const FILTER_MODE_OPTIONS_STRING = [
{ label: '妯＄硦鏌ヨ', value: 1 },
{ label: '绮惧噯鏌ヨ', value: 2 },
- ];
- // 鏁板瓧绫绘煡璇�
+ { label: '涓嶇瓑浜�', value: 7 },
+];
+// 瀛楃涓茬被鏌ヨ(鍏抽敭瀛楁煡璇笓鐢�)
+export const FILTER_MODE_OPTIONS_STRING_KEY = [
+ { label: '妯＄硦鏌ヨ', value: 1 },
+ { label: '绮惧噯鏌ヨ', value: 2 },
+];
+// 鏁板瓧绫绘煡璇�
export const FILTER_MODE_OPTIONS_NUM = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '澶т簬绛変簬', value: 3 },
@@ -11,9 +17,9 @@
{ label: '澶т簬', value: 5 },
{ label: '灏忎簬', value: 6 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
- // bool鏌ヨ
+];
+// bool鏌ヨ
export const FILTER_MODE_OPTIONS_BOOL = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
+];
diff --git a/HIAWms/hiawms_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js b/HIAWms/hiawms_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
index e70f08b..5c8ca3d 100644
--- a/HIAWms/hiawms_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
+++ b/HIAWms/hiawms_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
@@ -2,8 +2,14 @@
export const FILTER_MODE_OPTIONS_STRING = [
{ label: '妯＄硦鏌ヨ', value: 1 },
{ label: '绮惧噯鏌ヨ', value: 2 },
- ];
- // 鏁板瓧绫绘煡璇�
+ { label: '涓嶇瓑浜�', value: 7 },
+];
+// 瀛楃涓茬被鏌ヨ(鍏抽敭瀛楁煡璇笓鐢�)
+export const FILTER_MODE_OPTIONS_STRING_KEY = [
+ { label: '妯＄硦鏌ヨ', value: 1 },
+ { label: '绮惧噯鏌ヨ', value: 2 },
+];
+// 鏁板瓧绫绘煡璇�
export const FILTER_MODE_OPTIONS_NUM = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '澶т簬绛変簬', value: 3 },
@@ -11,9 +17,9 @@
{ label: '澶т簬', value: 5 },
{ label: '灏忎簬', value: 6 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
- // bool鏌ヨ
+];
+// bool鏌ヨ
export const FILTER_MODE_OPTIONS_BOOL = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
+];
diff --git a/PipeLineLems/pipelinelems_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js b/PipeLineLems/pipelinelems_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
index e70f08b..5c8ca3d 100644
--- a/PipeLineLems/pipelinelems_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
+++ b/PipeLineLems/pipelinelems_web/src/components/DyFormForHighQuery/DyFormForHighQueryOptions.js
@@ -2,8 +2,14 @@
export const FILTER_MODE_OPTIONS_STRING = [
{ label: '妯＄硦鏌ヨ', value: 1 },
{ label: '绮惧噯鏌ヨ', value: 2 },
- ];
- // 鏁板瓧绫绘煡璇�
+ { label: '涓嶇瓑浜�', value: 7 },
+];
+// 瀛楃涓茬被鏌ヨ(鍏抽敭瀛楁煡璇笓鐢�)
+export const FILTER_MODE_OPTIONS_STRING_KEY = [
+ { label: '妯＄硦鏌ヨ', value: 1 },
+ { label: '绮惧噯鏌ヨ', value: 2 },
+];
+// 鏁板瓧绫绘煡璇�
export const FILTER_MODE_OPTIONS_NUM = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '澶т簬绛変簬', value: 3 },
@@ -11,9 +17,9 @@
{ label: '澶т簬', value: 5 },
{ label: '灏忎簬', value: 6 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
- // bool鏌ヨ
+];
+// bool鏌ヨ
export const FILTER_MODE_OPTIONS_BOOL = [
{ label: '绮惧噯鏌ヨ', value: 2 },
{ label: '涓嶇瓑浜�', value: 7 },
- ];
+];
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
index 5c9b177..c371b80 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkPlan/Views/Pages/WorkPlan/WorkPlan.tsx
@@ -25,7 +25,7 @@
import { injectModel } from '@/libs/Provider/Provider'
// 寮曞叆鍏叡閫夐」閰嶇疆
import {
- FILTER_MODE_OPTIONS_STRING
+ FILTER_MODE_OPTIONS_STRING_KEY
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
// 寮曞叆鍏叡楂樼骇鏌ヨ宸ュ叿鏂囦欢
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
@@ -130,7 +130,7 @@
}
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
- initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -338,7 +338,7 @@
placeholder="璇烽�夋嫨"
class={styles.formItem}
>
- {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
<ElOption
key={option.value}
label={option.label}
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
index 75dc26f..61dc33e 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/WorkTask/Views/Pages/WorkTask/WorkTask.tsx
@@ -25,7 +25,7 @@
import { injectModel } from '@/libs/Provider/Provider'
// 寮曞叆鍏叡閫夐」閰嶇疆
import {
- FILTER_MODE_OPTIONS_STRING
+ FILTER_MODE_OPTIONS_STRING_KEY
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
// 寮曞叆鍏叡楂樼骇鏌ヨ宸ュ叿鏂囦欢
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
@@ -130,7 +130,7 @@
}
// 鏂扮増鐨勬煡璇㈤噸缃�
const resetQuery = () => {
- initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
}
//鏂扮増鐨勫鍑烘柟娉�
@@ -338,7 +338,7 @@
placeholder="璇烽�夋嫨"
class={styles.formItem}
>
- {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
<ElOption
key={option.value}
label={option.label}
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/Views/Pages/EntityNameClass/EntityNameClass\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/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
index 8fd6939..83af498 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/Views/Pages/EntityNameClass/EntityNameClass\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/Views/Pages/EntityNameClass/EntityNameClass\346\250\241\346\235\277.txt"
@@ -25,7 +25,7 @@
import { injectModel } from '@/libs/Provider/Provider'
// 引入公共选项配置
import {
- FILTER_MODE_OPTIONS_STRING
+ FILTER_MODE_OPTIONS_STRING_KEY
} from '@/components/DyFormForHighQuery/DyFormForHighQueryOptions';
// 引入公共高级查询工具文件
import { commonSaveCurHighQueryData,setValueForCurHighQueryData,commonGetHighQueryForm,initQueryForm,GetFilteredData } from '@/utils/myHighQueryUtils';
@@ -115,7 +115,7 @@
}
// 新版的查询重置
const resetQuery = () => {
- initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING);
+ initQueryForm(queryForm,_searchFormInputAttrs,FILTER_MODE_OPTIONS_STRING_KEY);
setValueForCurHighQueryData(_curHighQueryData,queryForm,_searchFormInputAttrs);
}
//新版的导出方法
@@ -265,7 +265,7 @@
placeholder="请选择"
class={styles.formItem}
>
- {FILTER_MODE_OPTIONS_STRING.map((option) => (
+ {FILTER_MODE_OPTIONS_STRING_KEY.map((option) => (
<ElOption
key={option.value}
label={option.label}
--
Gitblit v1.9.3