From 018f6f03be21995c57790d0276b2066e3aa37195 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Wed, 11 Mar 2020 20:46:45 +0800 Subject: [PATCH] chore: small fixes & custom input renamed as dynamic input --- .../{customAdd => dynamicInput}/enUS/basic.md | 2 +- .../enUS/custom.md | 4 +- .../{customAdd => dynamicInput}/enUS/index.md | 2 +- .../{customAdd => dynamicInput}/enUS/pair.md | 2 +- .../{customAdd => dynamicInput}/index.entry | 0 .../{customAdd => dynamicInput}/zhCN/basic.md | 2 +- .../zhCN/custom.md | 4 +- .../{customAdd => dynamicInput}/zhCN/index.md | 0 .../{customAdd => dynamicInput}/zhCN/pair.md | 2 +- .../components/form/enUS/customRule.md | 6 +- .../components/form/zhCN/customRule.md | 6 +- demo/init.js | 4 +- demo/loaders/NaiveUIDocLoader.js | 6 +- demo/menuOptions.js | 12 +-- demo/utils/ComponentDemo.vue | 94 ++++++++++--------- src/CustomAdd/index.js | 9 -- src/DynamicInput/index.js | 9 ++ src/{CustomAdd => DynamicInput}/src/input.vue | 16 ++-- src/{CustomAdd => DynamicInput}/src/main.vue | 22 ++--- src/{CustomAdd => DynamicInput}/src/pair.vue | 26 ++--- src/index.js | 4 +- styles/{CustomAdd.scss => DynamicInput.scss} | 10 +- styles/index.scss | 3 +- styles/mixins/mixins.scss | 2 +- 24 files changed, 126 insertions(+), 121 deletions(-) rename demo/documentation/components/{customAdd => dynamicInput}/enUS/basic.md (95%) rename demo/documentation/components/{customAdd => dynamicInput}/enUS/custom.md (95%) rename demo/documentation/components/{customAdd => dynamicInput}/enUS/index.md (98%) rename demo/documentation/components/{customAdd => dynamicInput}/enUS/pair.md (94%) rename demo/documentation/components/{customAdd => dynamicInput}/index.entry (100%) rename demo/documentation/components/{customAdd => dynamicInput}/zhCN/basic.md (95%) rename demo/documentation/components/{customAdd => dynamicInput}/zhCN/custom.md (95%) rename demo/documentation/components/{customAdd => dynamicInput}/zhCN/index.md (100%) rename demo/documentation/components/{customAdd => dynamicInput}/zhCN/pair.md (95%) delete mode 100644 src/CustomAdd/index.js create mode 100644 src/DynamicInput/index.js rename src/{CustomAdd => DynamicInput}/src/input.vue (65%) rename src/{CustomAdd => DynamicInput}/src/main.vue (88%) rename src/{CustomAdd => DynamicInput}/src/pair.vue (55%) rename styles/{CustomAdd.scss => DynamicInput.scss} (80%) diff --git a/demo/documentation/components/customAdd/enUS/basic.md b/demo/documentation/components/dynamicInput/enUS/basic.md similarity index 95% rename from demo/documentation/components/customAdd/enUS/basic.md rename to demo/documentation/components/dynamicInput/enUS/basic.md index 0d76c5d4c..67c01ff10 100644 --- a/demo/documentation/components/customAdd/enUS/basic.md +++ b/demo/documentation/components/dynamicInput/enUS/basic.md @@ -1,6 +1,6 @@ # Basic ```html - - +
 {{  JSON.stringify(test,0,2) }}
 
diff --git a/demo/documentation/components/customAdd/enUS/index.md b/demo/documentation/components/dynamicInput/enUS/index.md similarity index 98% rename from demo/documentation/components/customAdd/enUS/index.md rename to demo/documentation/components/dynamicInput/enUS/index.md index e0e415744..0552ba9e1 100644 --- a/demo/documentation/components/customAdd/enUS/index.md +++ b/demo/documentation/components/dynamicInput/enUS/index.md @@ -1,4 +1,4 @@ -# Custom Add +# Dynamic Input ## Demos ```demo diff --git a/demo/documentation/components/customAdd/enUS/pair.md b/demo/documentation/components/dynamicInput/enUS/pair.md similarity index 94% rename from demo/documentation/components/customAdd/enUS/pair.md rename to demo/documentation/components/dynamicInput/enUS/pair.md index 84cd8cb90..a904a92b6 100644 --- a/demo/documentation/components/customAdd/enUS/pair.md +++ b/demo/documentation/components/dynamicInput/enUS/pair.md @@ -1,6 +1,6 @@ # Pair ```html - - +
 {{  JSON.stringify(test,0,2) }}
 
diff --git a/demo/documentation/components/customAdd/zhCN/index.md b/demo/documentation/components/dynamicInput/zhCN/index.md similarity index 100% rename from demo/documentation/components/customAdd/zhCN/index.md rename to demo/documentation/components/dynamicInput/zhCN/index.md diff --git a/demo/documentation/components/customAdd/zhCN/pair.md b/demo/documentation/components/dynamicInput/zhCN/pair.md similarity index 95% rename from demo/documentation/components/customAdd/zhCN/pair.md rename to demo/documentation/components/dynamicInput/zhCN/pair.md index b2d4adfdb..0b897a136 100644 --- a/demo/documentation/components/customAdd/zhCN/pair.md +++ b/demo/documentation/components/dynamicInput/zhCN/pair.md @@ -1,6 +1,6 @@ # 键值对 ```html - - - @@ -43,7 +43,7 @@ You can custom you valiation by setting custom trigger in rules. - + diff --git a/demo/documentation/components/form/zhCN/customRule.md b/demo/documentation/components/form/zhCN/customRule.md index 1e8acda2c..24bd6306c 100644 --- a/demo/documentation/components/form/zhCN/customRule.md +++ b/demo/documentation/components/form/zhCN/customRule.md @@ -17,12 +17,12 @@ - - - + diff --git a/demo/init.js b/demo/init.js index bf3a62db1..45c41e4ad 100644 --- a/demo/init.js +++ b/demo/init.js @@ -17,7 +17,7 @@ import nswitch from './documentation/components/switch' import input from './documentation/components/input' import select from './documentation/components/select' import cascader from './documentation/components/cascader' -import customAdd from './documentation/components/customAdd' +import dynamicInput from './documentation/components/dynamicInput' import modal from './documentation/components/modal' import message from './documentation/components/message' import tooltip from './documentation/components/tooltip' @@ -165,7 +165,7 @@ const children = [ { path: '/n-input', component: input }, { path: '/n-select', component: select }, { path: '/n-cascader', component: cascader }, - { path: '/n-custom-add', component: customAdd }, + { path: '/n-dynamic-input', component: dynamicInput }, { path: '/n-modal', component: modal }, { path: '/n-message', component: message }, { path: '/n-tooltip', component: tooltip }, diff --git a/demo/loaders/NaiveUIDocLoader.js b/demo/loaders/NaiveUIDocLoader.js index dcfa7bf6a..5870a1e44 100644 --- a/demo/loaders/NaiveUIDocLoader.js +++ b/demo/loaders/NaiveUIDocLoader.js @@ -1,7 +1,9 @@ const convertMd2Doc = require('./convertMd2Doc') +const path = require('path') module.exports = function (content) { const env = process.env.NODE_ENV - const url = this.resourcePath - return convertMd2Doc(content, env, url) + const projectPath = path.resolve(__dirname, '..', '..') + const relativeURL = this.resourcePath.replace(projectPath + '/', '') + return convertMd2Doc(content, env, relativeURL) } diff --git a/demo/menuOptions.js b/demo/menuOptions.js index 256e5cf1a..7d71de1af 100644 --- a/demo/menuOptions.js +++ b/demo/menuOptions.js @@ -196,10 +196,10 @@ export default function (locale, instance) { path: `/${instance.lang}/${instance.theme}/doc` + '/n-checkbox' }, { - name: 'Custom Add', - title: '自定义增加', - titleExtra: 'Custom Add', - path: `/${instance.lang}/${instance.theme}/doc` + '/n-custom-add' + name: 'Dynamic Input', + title: '动态输入', + titleExtra: 'Dynamic Input', + path: `/${instance.lang}/${instance.theme}/doc` + '/n-dynamic-input' }, { name: 'Date Picker', @@ -674,8 +674,8 @@ export default function (locale, instance) { path: `/${instance.lang}/${instance.theme}/doc` + '/n-checkbox' }, { - name: 'Custom Add', - path: `/${instance.lang}/${instance.theme}/doc` + '/n-custom-add' + name: 'Dynamic Input', + path: `/${instance.lang}/${instance.theme}/doc` + '/n-dynamic-input' }, { name: 'Date Picker', diff --git a/demo/utils/ComponentDemo.vue b/demo/utils/ComponentDemo.vue index e6301bebe..c731f05cc 100644 --- a/demo/utils/ComponentDemo.vue +++ b/demo/utils/ComponentDemo.vue @@ -2,11 +2,13 @@ { "zh-CN": { "show": "显示代码", - "hide": "收起代码" + "hide": "收起代码", + "editOnGithub": "在 Github 上编辑" }, "en-US": { "show": "Show Code", - "hide": "Hide Code" + "hide": "Hide Code", + "editOnGithub": "Edit on Github" } } @@ -25,46 +27,47 @@ @@ -77,14 +80,14 @@