From 26cd37be23e23f3ffea4f92c57c498e6518072c0 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Tue, 8 Aug 2023 16:20:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(form):=20text=E9=85=8D=E7=BD=AE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form/src/containers/Container.vue | 18 ++++++++++--------
 packages/form/src/schema.ts                |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/form/src/containers/Container.vue b/packages/form/src/containers/Container.vue
index 72a88157..2ecea9b7 100644
--- a/packages/form/src/containers/Container.vue
+++ b/packages/form/src/containers/Container.vue
@@ -14,7 +14,7 @@
     ></m-fields-hidden>
 
     <component
-      v-else-if="items && !config.text && type && display"
+      v-else-if="items && !text && type && display"
       :key="key(config)"
       :size="size"
       :is="tagName"
@@ -35,12 +35,12 @@
     <template v-else-if="type && display && !showDiff">
       <TMagicFormItem
         :style="config.tip ? 'flex: 1' : ''"
-        :class="{ hidden: `${itemLabelWidth}` === '0' || !config.text }"
+        :class="{ hidden: `${itemLabelWidth}` === '0' || !text }"
         :prop="itemProp"
         :label-width="itemLabelWidth"
         :rules="rule"
       >
-        <template #label><span v-html="type === 'checkbox' ? '' : config.text"></span></template>
+        <template #label><span v-html="type === 'checkbox' ? '' : text"></span></template>
         <TMagicTooltip v-if="tooltip">
           <component
             :key="key(config)"
@@ -91,13 +91,13 @@
       <!-- 上次内容 -->
       <TMagicFormItem
         :style="config.tip ? 'flex: 1' : ''"
-        :class="{ hidden: `${itemLabelWidth}` === '0' || !config.text }"
+        :class="{ hidden: `${itemLabelWidth}` === '0' || !text }"
         :prop="itemProp"
         :label-width="itemLabelWidth"
         :rules="rule"
         style="background: #f7dadd"
       >
-        <template #label><span v-html="type === 'checkbox' ? '' : config.text"></span></template>
+        <template #label><span v-html="type === 'checkbox' ? '' : text"></span></template>
         <TMagicTooltip v-if="tooltip">
           <component
             :key="key(config)"
@@ -140,13 +140,13 @@
       <!-- 当前内容 -->
       <TMagicFormItem
         :style="config.tip ? 'flex: 1' : ''"
-        :class="{ hidden: `${itemLabelWidth}` === '0' || !config.text }"
+        :class="{ hidden: `${itemLabelWidth}` === '0' || !text }"
         :prop="itemProp"
         :label-width="itemLabelWidth"
         :rules="rule"
         style="background: #def7da"
       >
-        <template #label><span v-html="type === 'checkbox' ? '' : config.text"></span></template>
+        <template #label><span v-html="type === 'checkbox' ? '' : text"></span></template>
         <TMagicTooltip v-if="tooltip">
           <component
             :key="key(config)"
@@ -294,6 +294,8 @@ const tagName = computed(() => {
 
 const disabled = computed(() => props.disabled || filterFunction(mForm, props.config.disabled, props));
 
+const text = computed(() => filterFunction(mForm, props.config.text, props));
+
 const tooltip = computed(() => filterFunction(mForm, props.config.tooltip, props));
 
 const extra = computed(() => filterFunction(mForm, props.config.extra, props));
@@ -331,7 +333,7 @@ watch(
   showDiff,
   (showDiff) => {
     if (type.value === 'hidden') return;
-    if (items.value && !props.config.text && type.value && display.value) return;
+    if (items.value && !text.value && type.value && display.value) return;
     if (display.value && showDiff && type.value) {
       emit('addDiffCount');
     }
diff --git a/packages/form/src/schema.ts b/packages/form/src/schema.ts
index f10b266d..281d625b 100644
--- a/packages/form/src/schema.ts
+++ b/packages/form/src/schema.ts
@@ -84,7 +84,7 @@ export interface FormItem {
   /** 值发生改变时调用的方法 */
   onChange?: OnChangeHandler;
   /** label 标签的文本 */
-  text?: string;
+  text?: string | FilterFunction;
   /** 右侧感叹号 */
   tip?: string;