fix: 地区选择、日期时间占位符配置展示

vusion · Jan 29, 2024 · 479053d · 479053d
1 parent 6d9617c
commit 479053d
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 2 deletions.
diff --git a/src/area/api.ts b/src/area/api.ts
@@ -140,6 +140,15 @@ namespace nasl.ui {
       }
     })
     disabled: nasl.core.Boolean = false;
+    @Prop({
+      group: '主要属性',
+      title: '占位提示',
+      description: '',
+      setter: {
+        concept: "InputSetter"
+      }
+    })
+    placeholder: nasl.core.String = '请选择';
     @Event({
       title: '点击右上方完成按钮',
       description: '点击右上方完成按钮'

diff --git a/src/area/api.yaml b/src/area/api.yaml
@@ -100,6 +100,12 @@
       default: false
       group: 状态属性
       description: 置灰显示，且禁止任何交互（焦点、点击、选择、输入等）
+    - name: placeholder
+      title: 占位提示
+      type: string
+      default: 请选择
+      group: 主要属性
+      description: ""
   slots:
     - concept: Slot
       name: default

diff --git a/src/area/demo/index.vue b/src/area/demo/index.vue
@@ -27,6 +27,11 @@
         </van-area>
     </demo-block>
 
+    <demo-block card title="占位符">
+        <van-area placeholder="请选择">
+          <template #title>标题</template>
+        </van-area>
+    </demo-block>
   </demo-section>
 </template>
 

diff --git a/src/area/index.js b/src/area/index.js
@@ -55,6 +55,9 @@ export default createComponent({
       type: String,
       default: 'json',
     },
+    placeholder: {
+      type: String,
+    },
     labelField: {
       type: String,
       default: '',
@@ -615,6 +618,7 @@ export default createComponent({
           scopedSlots={tempSlot}
           readonly
           disabled={this.disabled}
+          placeholder={this.placeholder}
           isLink
           input-align={this.inputAlign || 'right'}
           onClick={this.inDesigner() ? this.designerOpen : this.onClickField}

diff --git a/src/calendar/api.ts b/src/calendar/api.ts
@@ -112,6 +112,15 @@ namespace nasl.ui {
       }
     })
     disabled: nasl.core.Boolean = false;
+    @Prop({
+      group: '主要属性',
+      title: '占位提示',
+      description: '',
+      setter: {
+        concept: "InputSetter"
+      }
+    })
+    placeholder: nasl.core.String = '请选择';
     @Event({
       title: '确认',
       description: '点击完成按钮时触发的事件'

diff --git a/src/calendar/api.yaml b/src/calendar/api.yaml
@@ -82,6 +82,12 @@
       default: false
       description: 置灰显示，且禁止任何交互（焦点、点击、选择、输入等）
       group: 状态属性
+    - name: placeholder
+      title: 占位提示
+      type: string
+      default: 请选择
+      group: 主要属性
+      description: ""
   slots:
     - concept: Slot
       name: default

diff --git a/src/calendar/demo/index.vue b/src/calendar/demo/index.vue
@@ -29,6 +29,18 @@
         ></van-calendar>
       </van-cell>
     </demo-block>
+
+    <demo-block title="占位符">
+      <van-cell>
+        <template #title>
+          <span>日期选择</span>
+        </template>
+        <van-calendar
+          title="选择日期"
+          placeholder="请选择日期"
+        ></van-calendar>
+      </van-cell>
+    </demo-block>
   </demo-section>
 </template>
 

diff --git a/src/calendar/index.js b/src/calendar/index.js
@@ -48,6 +48,9 @@ export default createComponent({
     rowHeight: [Number, String],
     confirmText: String,
     rangePrompt: String,
+    placeholder: {
+      type: String,
+    },
     labelField: {
       type: String,
       default: '',
@@ -634,6 +637,7 @@ export default createComponent({
             scopedSlots={tempSlot}
             readonly
             disabled={this.disabled}
+            placeholder={this.placeholder}
             isLink
             input-align={this.inputAlign || 'right'}
             onClick={this.inDesigner() ? this.designerOpen : this.togglePopup}

diff --git a/src/datetime-picker/api.ts b/src/datetime-picker/api.ts
@@ -302,6 +302,15 @@ namespace nasl.ui {
       }
     })
     disabled: nasl.core.Boolean = false;
+    @Prop({
+      group: '主要属性',
+      title: '占位提示',
+      description: '',
+      setter: {
+        concept: "InputSetter"
+      }
+    })
+    placeholder: nasl.core.String = '请选择';
     @Event({
       title: '确认',
       description: '点击完成按钮时触发的事件'

diff --git a/src/datetime-picker/api.yaml b/src/datetime-picker/api.yaml
@@ -325,6 +325,12 @@
       default: false
       description: 置灰显示，且禁止任何交互（焦点、点击、选择、输入等）
       group: 状态属性
+    - name: placeholder
+      title: 占位提示
+      type: string
+      default: 请选择
+      group: 主要属性
+      description: ""
   slots:
     - concept: Slot
       name: default

diff --git a/src/datetime-picker/demo/index.vue b/src/datetime-picker/demo/index.vue
@@ -117,8 +117,8 @@
           <van-datetime-picker :value.sync="value.secondTime" type="time" unit="second" :title="t('timeType')" />
       </demo-block>
 
-      <demo-block card title="临时测试">
-          <van-datetime-picker :close-on-click-overlay="true" type="date" />
+      <demo-block card title="占位符">
+          <van-datetime-picker :close-on-click-overlay="true" type="date" placeholder="请选择日期时间" />
       </demo-block>
   </demo-section>
 </template>