Merge branch 'youlaitech:master' into master

Author: Ninjaxsh

src/components/PageModal/Form.vue

@@ -26,15 +26,7 @@
         </template>
         <!-- Input 输入框 -->
         <template v-if="item.type === 'input' || item.type === undefined">
-          <template v-if="item.attrs?.type === 'number'">
-            <el-input
-              v-model.number="formData[item.prop]"
-              v-bind="item.attrs"
-            />
-          </template>
-          <template v-else>
-            <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
-          </template>
+          <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
         </template>
         <!-- Select 选择器 -->
         <template v-else-if="item.type === 'select'">
@@ -72,6 +64,10 @@
         <template v-else-if="item.type === 'date-picker'">
           <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
         </template>
+        <!-- Text 文本 -->
+        <template v-else-if="item.type === 'text'">
+          <el-text v-bind="item.attrs">{{ formData[item.prop] }}</el-text>
+        </template>
         <!-- 自定义 -->
         <template v-else-if="item.type === 'custom'">
           <slot

src/components/PageModal/types.ts

@@ -28,6 +28,7 @@ export type IFormItems<T = any> = Array<{
     | "tree-select"
     | "date-picker"
     | "input-number"
+    | "text"
     | "custom";
   // 组件属性
   attrs?: IObject;