diff --git a/src/assets/image/logo/header.png.REMOVED.git-id b/src/assets/image/logo/header.png.REMOVED.git-id index a4453b50..e78ecb52 100644 --- a/src/assets/image/logo/header.png.REMOVED.git-id +++ b/src/assets/image/logo/header.png.REMOVED.git-id @@ -1 +1 @@ -d39351bf9b78b7abf9eecac82779085241498e19 \ No newline at end of file +762198f6b192d9faef94d5eab316518f842f9c88 \ No newline at end of file diff --git a/src/assets/image/logo/index@3x.png.REMOVED.git-id b/src/assets/image/logo/index@3x.png.REMOVED.git-id index 857259ca..91b94d86 100644 --- a/src/assets/image/logo/index@3x.png.REMOVED.git-id +++ b/src/assets/image/logo/index@3x.png.REMOVED.git-id @@ -1 +1 @@ -3227029199618757411bbdf199af6fdaa9d25e01 \ No newline at end of file +183e2862510cac25d289c2d00765144d685eb6fa \ No newline at end of file diff --git a/src/components/core/IconSelect/index.vue b/src/components/core/IconSelect/index.vue index d47d4595..b7595eba 100644 --- a/src/components/core/IconSelect/index.vue +++ b/src/components/core/IconSelect/index.vue @@ -3,7 +3,7 @@
@@ -24,7 +24,7 @@ -
+
{{item.title}}
@@ -62,26 +62,37 @@ import icon from '@/assets/library/font-awesome-4.7.0-icon/icon.js' export default { props: { + // 值 value: { type: String, required: false, default: '' }, + // 占位符 placeholder: { type: String, required: false, default: '请选择' }, + // 弹出界面的方向 + placement: { + type: String, + required: false, + default: 'right' + }, + // 是否可清空 clearable: { type: Boolean, required: false, default: true }, + // 是否允许用户输入 userInput: { type: Boolean, required: false, default: false }, + // 是否在选择后自动关闭 autoClose: { type: Boolean, required: false, @@ -154,9 +165,6 @@ export default { overflow-y: scroll; border-top: none; border-bottom: none; - &.long { - max-height: 600px; - } .class { .class-title { line-height: 30px; diff --git a/src/pages/demo/plugins/font-awesome/select.vue b/src/pages/demo/plugins/font-awesome/select.vue index f58c3c60..9d14e6c5 100644 --- a/src/pages/demo/plugins/font-awesome/select.vue +++ b/src/pages/demo/plugins/font-awesome/select.vue @@ -1,47 +1,27 @@