diff --git a/demo/components/multipleLabelsDemo/customMultipleLabels.demo.vue b/demo/components/multipleLabelsDemo/customMultipleLabels.demo.vue
new file mode 100644
index 000000000..ecab214bd
--- /dev/null
+++ b/demo/components/multipleLabelsDemo/customMultipleLabels.demo.vue
@@ -0,0 +1,53 @@
+
+
+
+
+
v-model: {{ test1 }}
+
+
+
+
+
+
+
diff --git a/demo/components/multipleLabelsDemo/index.vue b/demo/components/multipleLabelsDemo/index.vue
new file mode 100644
index 000000000..5b5d74d1b
--- /dev/null
+++ b/demo/components/multipleLabelsDemo/index.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
diff --git a/demo/components/multipleLabelsDemo/multipleLabels.demo.vue b/demo/components/multipleLabelsDemo/multipleLabels.demo.vue
new file mode 100644
index 000000000..718690410
--- /dev/null
+++ b/demo/components/multipleLabelsDemo/multipleLabels.demo.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
v-model: {{ test1 }}
+
+
+
+
+
+
+
diff --git a/demo/demo.vue b/demo/demo.vue
index 8ac3b3dfb..29482c3f8 100644
--- a/demo/demo.vue
+++ b/demo/demo.vue
@@ -135,6 +135,14 @@ export default {
name: 'Select',
path: '/n-select'
},
+ {
+ name: 'Cascader',
+ path: '/n-cascader'
+ },
+ {
+ name: 'MultipleLabels',
+ path: '/n-MultipleLabels'
+ },
{
name: 'Steps',
path: '/n-steps'
diff --git a/demo/index.js b/demo/index.js
index fa14d4d24..5a97db01e 100644
--- a/demo/index.js
+++ b/demo/index.js
@@ -17,6 +17,7 @@ import advanceTableDemo from './components/advanceTableDemo'
import inputDemo from './components/inputDemo'
import selectDemo from './components/selectDemo'
import cascaderDemo from './components/cascaderDemo'
+import multipleLabelsDemo from './components/multipleLabelsDemo'
import modalDemo from './components/modalDemo'
import nimbusFormCardDemo from './components/nimbusFormCardDemo'
import messageDemo from './components/messageDemo'
@@ -80,6 +81,7 @@ const routes = [
{ path: '/n-input', component: inputDemo },
{ path: '/n-select', component: selectDemo },
{ path: '/n-cascader', component: cascaderDemo },
+ { path: '/n-MultipleLabels', component: multipleLabelsDemo },
{ path: '/n-modal', component: modalDemo },
{ path: '/n-nimbus-form-card', component: nimbusFormCardDemo },
{ path: '/n-message', component: messageDemo },
@@ -97,7 +99,6 @@ const routes = [
{ path: '/n-tab', component: tabDemo },
{ path: '/n-time-picker', component: timePickerDemo },
{ path: '/n-confirm', component: confirmDemo },
-
{ path: '/n-router-debug', component: routerDebug },
{ path: '/n-modal-debug', component: modalDebug },
{ path: '/n-scrollbar-debug', component: scrollbarDebug },
diff --git a/index.js b/index.js
index 4e0399f2d..d11a968d1 100644
--- a/index.js
+++ b/index.js
@@ -13,6 +13,7 @@ import RoundButton from './packages/common/Button'
import Switch from './packages/common/Switch'
import Select from './packages/common/Select'
import Cascader from './packages/common/Cascader'
+import MultipleLabels from './packages/common/MultipleLabels'
import Modal from './packages/common/Modal'
import Input from './packages/common/Input'
import Message from './packages/common/Message'
@@ -75,6 +76,7 @@ function install (Vue) {
NimbusIcon.install(Vue)
Radio.install(Vue)
Cascader.install(Vue)
+ MultipleLabels.install(Vue)
Form.install(Vue)
Tab.install(Vue)
TimePicker.install(Vue)
diff --git a/package.json b/package.json
index 99dce04bc..44d8fb0b1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "naive-ui",
- "version": "0.2.77",
+ "version": "0.2.78",
"description": "",
"main": "index.js",
"scripts": {
diff --git a/packages/common/Cascader/src/MutipleCascader.vue b/packages/common/Cascader/src/MultipleCascader.vue
similarity index 99%
rename from packages/common/Cascader/src/MutipleCascader.vue
rename to packages/common/Cascader/src/MultipleCascader.vue
index a67243207..577c89a00 100644
--- a/packages/common/Cascader/src/MutipleCascader.vue
+++ b/packages/common/Cascader/src/MultipleCascader.vue
@@ -85,7 +85,7 @@ import toggleable from '../../../mixins/toggleable'
import CasPanel from './CasPanel'
export default {
- name: 'MutipleCascader',
+ name: 'MultipleCascader',
components: {
NIcon,
CasPanel
diff --git a/packages/common/Cascader/src/main.vue b/packages/common/Cascader/src/main.vue
index b3ca7625d..20a7b5357 100644
--- a/packages/common/Cascader/src/main.vue
+++ b/packages/common/Cascader/src/main.vue
@@ -2,7 +2,7 @@
/**
* Warning: There are some potential problems if there are too many items!
*/
-import MutipleCascader from './MutipleCascader'
+import MultipleCascader from './MultipleCascader'
export default {
name: 'NCascader',
@@ -70,7 +70,7 @@ export default {
change: this.handleChange.bind(this),
setactive: this.handleSetActive.bind(this)
}
- return h(MutipleCascader, {
+ return h(MultipleCascader, {
props: { ...this.$props, active: this.active, placement: 'bottom-start', widthMode: 'activator' },
on
})
diff --git a/packages/common/MultipleLabels/index.js b/packages/common/MultipleLabels/index.js
new file mode 100644
index 000000000..fc46e3e33
--- /dev/null
+++ b/packages/common/MultipleLabels/index.js
@@ -0,0 +1,8 @@
+/* istanbul ignore file */
+import MultipleLabels from './src/main.vue'
+
+MultipleLabels.install = function (Vue) {
+ Vue.component(MultipleLabels.name, MultipleLabels)
+}
+
+export default MultipleLabels
diff --git a/packages/common/MultipleLabels/src/main.vue b/packages/common/MultipleLabels/src/main.vue
new file mode 100644
index 000000000..0a17c55a9
--- /dev/null
+++ b/packages/common/MultipleLabels/src/main.vue
@@ -0,0 +1,125 @@
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+
+
diff --git a/styles/MultipleLabels.scss b/styles/MultipleLabels.scss
new file mode 100644
index 000000000..e650451cb
--- /dev/null
+++ b/styles/MultipleLabels.scss
@@ -0,0 +1,23 @@
+.n-multiple-labels {
+ .n-multiple-labels__item {
+ margin-bottom: 30px;
+ .n-multiple-labels__item--title {
+ display: block;
+ margin: 0 0 8px;
+ }
+ .n-multiple-labels__item--content {
+ display: flex;
+ .n-multiple-labels__item--input {
+ flex: 2;
+ display: inline-block;
+ margin-right: 13px;
+ }
+ .n-multiple-labels__item--action {
+ flex: 1;
+ display: inline-block;
+ align-items: center;
+ display: flex;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/styles/index.scss b/styles/index.scss
index 1fed7c949..a5c44039f 100644
--- a/styles/index.scss
+++ b/styles/index.scss
@@ -14,6 +14,7 @@
@import "./Input.scss";
@import "./Select.scss";
@import "./Cascader.scss";
+@import "./MultipleLabels.scss";
@import "./Message.scss";
@import "./Tooltip.scss";
@import "./Notification.scss";