From 479053dbe86e4fe18b2b42cfb1ed51603562cd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=A1=E9=A3=8E?= <18012261618@126.com> Date: Mon, 29 Jan 2024 12:54:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E3=80=81=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E5=8D=A0=E4=BD=8D?= =?UTF-8?q?=E7=AC=A6=E9=85=8D=E7=BD=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/area/api.ts | 9 +++++++++ src/area/api.yaml | 6 ++++++ src/area/demo/index.vue | 5 +++++ src/area/index.js | 4 ++++ src/calendar/api.ts | 9 +++++++++ src/calendar/api.yaml | 6 ++++++ src/calendar/demo/index.vue | 12 ++++++++++++ src/calendar/index.js | 4 ++++ src/datetime-picker/api.ts | 9 +++++++++ src/datetime-picker/api.yaml | 6 ++++++ src/datetime-picker/demo/index.vue | 4 ++-- 11 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/area/api.ts b/src/area/api.ts index 85a26c7db..052f05c90 100644 --- 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 index 585fda633..283b0e9d9 100644 --- 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 index 02e4d0e2f..08a66e5eb 100644 --- a/src/area/demo/index.vue +++ b/src/area/demo/index.vue @@ -27,6 +27,11 @@ + + + + + diff --git a/src/area/index.js b/src/area/index.js index 5d5f90800..11278bf58 100644 --- 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 index a2a7e07db..45a22dcbf 100644 --- 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 index 1f3df9dec..050c20fa9 100644 --- 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 index 0c2d43b69..75c4465e3 100644 --- a/src/calendar/demo/index.vue +++ b/src/calendar/demo/index.vue @@ -29,6 +29,18 @@ > + + + + + + + diff --git a/src/calendar/index.js b/src/calendar/index.js index f53ddc669..f7a77e7ea 100644 --- 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 index fd1cb61e0..9ae5c9d7c 100644 --- 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 index 42a7bfcfc..c5519313c 100644 --- 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 index 9b5a56c0e..4875da000 100644 --- a/src/datetime-picker/demo/index.vue +++ b/src/datetime-picker/demo/index.vue @@ -117,8 +117,8 @@ - - + +