diff --git a/read/1.png b/read/1.png deleted file mode 100644 index c1ebb6d..0000000 Binary files a/read/1.png and /dev/null differ diff --git a/read/2.png b/read/2.png deleted file mode 100644 index 4f1a026..0000000 Binary files a/read/2.png and /dev/null differ diff --git a/read/3.png b/read/3.png deleted file mode 100644 index a1ce9e0..0000000 Binary files a/read/3.png and /dev/null differ diff --git a/read/4.png b/read/4.png deleted file mode 100644 index 2e7fcac..0000000 Binary files a/read/4.png and /dev/null differ diff --git a/read/5.png b/read/5.png deleted file mode 100644 index cd205ee..0000000 Binary files a/read/5.png and /dev/null differ diff --git a/read/6.png b/read/6.png deleted file mode 100644 index 92f7242..0000000 Binary files a/read/6.png and /dev/null differ diff --git a/src/components/u-info/index.vue b/src/components/u-info/index.vue new file mode 100644 index 0000000..2f74572 --- /dev/null +++ b/src/components/u-info/index.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/src/components/u-screenfull/index.vue b/src/components/u-screenfull/index.vue index 6253ab2..d9e3ca2 100644 --- a/src/components/u-screenfull/index.vue +++ b/src/components/u-screenfull/index.vue @@ -1,8 +1,10 @@ - diff --git a/src/components/u-upload/index.vue b/src/components/u-upload/index.vue index 4a49826..f654d6b 100644 --- a/src/components/u-upload/index.vue +++ b/src/components/u-upload/index.vue @@ -2,7 +2,8 @@ - {{ tag.title }} - +
+ {{ tag.title }} + +
@@ -171,32 +175,52 @@ border: 1px solid #d8dce5; color: #495060; background: #fff; - padding: 0 8px; font-size: 12px; padding: 0 10px; box-sizing: border-box; margin-left: 5px; margin-top: 4px; + /*display: flex;*/ + /*align-items: center;*/ &:first-of-type { margin-left: 15px; } &:last-of-type { margin-right: 15px; } + .tags-inner{ + display: flex; + align-items: center; + } + .tag-icon{ + margin-left: 6px; + } + .tag-icon{ + display: none; + } + &:hover{ + .tag-icon{ + display: block; + + } + } + &.active .tag-icon{ + display: block; + } &.active { background-color: #42b983; color: #fff; border-color: #42b983; - &::before { - content: ''; - background: #fff; - display: inline-block; - width: 8px; - height: 8px; - border-radius: 50%; - position: relative; - margin-right: 2px; - } + /* &::before {*/ + /* content: '';*/ + /* background: #fff;*/ + /* display: inline-block;*/ + /* width: 8px;*/ + /* height: 8px;*/ + /* border-radius: 50%;*/ + /* position: relative;*/ + /* margin-right: 2px;*/ + /* }*/ } } diff --git a/src/layout/components/UHeader/index.vue b/src/layout/components/UHeader/index.vue index baa4631..4f2e391 100644 --- a/src/layout/components/UHeader/index.vue +++ b/src/layout/components/UHeader/index.vue @@ -15,7 +15,7 @@
- Github地址 + @@ -43,6 +43,7 @@ import TagViews from '../TagsView/index.vue' import UHamburger from "@/components/u-Hamburger/index.vue" import UScreenFull from '@/components/u-screenfull/index.vue' + import UInfo from '@/components/u-info/index.vue' import MenuSlide from '../Sidebar/menuSlide.vue' import {computed, ref,} from 'vue' import {useRouter} from 'vue-router' diff --git a/src/router/index.ts b/src/router/index.ts index d0ad169..3bf923b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -58,7 +58,7 @@ const clipboardTable = { path: 'index', component: () => import('@/views/clipboard/index.vue'), name: 'map', - meta: { title: 'clipboard', noCache: true , roles:['other'] ,icon: 'document-copy',} + meta: { title: '剪贴板', noCache: true , roles:['other'] ,icon: 'document-copy',} }, ] diff --git a/src/router/modules/components.ts b/src/router/modules/components.ts index ecbb053..90fcfaa 100644 --- a/src/router/modules/components.ts +++ b/src/router/modules/components.ts @@ -8,35 +8,11 @@ const componentsRouter = { redirect: 'noRedirect', name: 'components', meta: { - title: '组件', + title: '基础组件', icon: 'Histogram', roles:['other'] }, children: [ - { - path: 'editor', - component: () => import('@/views/components-demo/editor.vue'), - name: 'editor', - meta: { title: '富文本编辑器', noCache: true, roles:['other'] } - }, - { - path: 'mark-down', - component: () => import('@/views/components-demo/mark-down.vue'), - name: 'mark-down', - meta: { title: 'markDown', noCache: true , roles:['other']} - }, - { - path: 'form', - component: () => import('@/views/components-demo/form.vue'), - name: 'form', - meta: { title: '表单', noCache: true , roles:['other']} - }, - { - path: 'scroll', - component: () => import('@/views/components-demo/scroll.vue'), - name: 'scroll', - meta: { title: '无限滚动', noCache: true } - }, { path: 'button', component: () => import('@/views/components-demo/button.vue'), @@ -50,11 +26,62 @@ const componentsRouter = { meta: { title: '上传图片', noCache: true } }, { - path: 'count', - component: () => import('@/views/components-demo/count.vue'), - name: 'count', - meta: { title: '数字自增长', noCache: true } + path: 'form', + component: () => import('@/views/components-demo/form.vue'), + name: 'form', + meta: { title: '表单', noCache: true , roles:['other']} }, + { + path: 'link', + component: () => import('@/views/components-demo/link.vue'), + name: 'link', + meta: { title: '文字链接', noCache: true , roles:['other']} + }, + { + path: 'radio', + component: () => import('@/views/components-demo/radio.vue'), + name: 'radio', + meta: { title: '单选框', noCache: true , roles:['other']} + }, + { + path: 'checkbox', + component: () => import('@/views/components-demo/checkbox.vue'), + name: 'checkbox', + meta: { title: '多选框', noCache: true , roles:['other']} + }, + { + path: 'input', + component: () => import('@/views/components-demo/input.vue'), + name: 'input', + meta: { title: '输入框', noCache: true , roles:['other']} + }, + { + path: 'inputnumber', + component: () => import('@/views/components-demo/inputnumber.vue'), + name: 'inputnumber', + meta: { title: '数字输入框', noCache: true , roles:['other']} + }, + { + path: 'timepicker', + component: () => import('@/views/components-demo/timepicker.vue'), + name: 'timepicker', + meta: { title: '时间选择器', noCache: true , roles:['other']} + }, + { + path: 'datetimepicker', + component: () => import('@/views/components-demo/datetimepicker.vue'), + name: 'datetimepicker', + meta: { title: '日期时间选择器', noCache: true , roles:['other']} + }, + { + path: 'scroll', + component: () => import('@/views/components-demo/scroll.vue'), + name: 'scroll', + meta: { title: '无限滚动', noCache: true } + }, + + + ] } diff --git a/src/router/modules/other.ts b/src/router/modules/other.ts index 5a24865..1367974 100644 --- a/src/router/modules/other.ts +++ b/src/router/modules/other.ts @@ -12,6 +12,18 @@ const othersRouter = { icon: 'management' }, children: [ + { + path: 'editor', + component: () => import('@/views/other/editor.vue'), + name: 'editor', + meta: { title: '富文本编辑器', noCache: true, roles:['other'] } + }, + { + path: 'mark-down', + component: () => import('@/views/other/mark-down.vue'), + name: 'mark-down', + meta: { title: 'markDown', noCache: true , roles:['other']} + }, { path: 'print', component: () => import('@/views/other/print.vue'), @@ -48,6 +60,12 @@ const othersRouter = { name: 'right-menu', meta: { title: '右键菜单', noCache: true } }, + { + path: 'count', + component: () => import('@/views/other/count.vue'), + name: 'count', + meta: { title: '数字自增长', noCache: true } + }, ] } diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue index 28c7f53..d8c017e 100644 --- a/src/views/clipboard/index.vue +++ b/src/views/clipboard/index.vue @@ -1,15 +1,23 @@ + diff --git a/src/views/components-demo/count.vue b/src/views/components-demo/count.vue deleted file mode 100644 index 0a4098c..0000000 --- a/src/views/components-demo/count.vue +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - diff --git a/src/views/components-demo/datetimepicker.vue b/src/views/components-demo/datetimepicker.vue new file mode 100644 index 0000000..403532b --- /dev/null +++ b/src/views/components-demo/datetimepicker.vue @@ -0,0 +1,166 @@ + + + diff --git a/src/views/components-demo/input.vue b/src/views/components-demo/input.vue new file mode 100644 index 0000000..21506de --- /dev/null +++ b/src/views/components-demo/input.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/views/components-demo/inputnumber.vue b/src/views/components-demo/inputnumber.vue new file mode 100644 index 0000000..5ba534c --- /dev/null +++ b/src/views/components-demo/inputnumber.vue @@ -0,0 +1,116 @@ + + + diff --git a/src/views/components-demo/link.vue b/src/views/components-demo/link.vue new file mode 100644 index 0000000..c55a1cd --- /dev/null +++ b/src/views/components-demo/link.vue @@ -0,0 +1,95 @@ + + + diff --git a/src/views/components-demo/radio.vue b/src/views/components-demo/radio.vue new file mode 100644 index 0000000..e3564cd --- /dev/null +++ b/src/views/components-demo/radio.vue @@ -0,0 +1,114 @@ + + + diff --git a/src/views/components-demo/slider.vue b/src/views/components-demo/slider.vue new file mode 100644 index 0000000..eb72234 --- /dev/null +++ b/src/views/components-demo/slider.vue @@ -0,0 +1,148 @@ + + + diff --git a/src/views/components-demo/timepicker.vue b/src/views/components-demo/timepicker.vue new file mode 100644 index 0000000..2c1c771 --- /dev/null +++ b/src/views/components-demo/timepicker.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/views/components-demo/upload.vue b/src/views/components-demo/upload.vue index 833f057..2de3fdf 100644 --- a/src/views/components-demo/upload.vue +++ b/src/views/components-demo/upload.vue @@ -1,11 +1,70 @@ - \ No newline at end of file diff --git a/src/views/other/count.vue b/src/views/other/count.vue index b350b02..0a4098c 100644 --- a/src/views/other/count.vue +++ b/src/views/other/count.vue @@ -1,11 +1,156 @@ - - \ No newline at end of file diff --git a/src/views/components-demo/editor.vue b/src/views/other/editor.vue similarity index 100% rename from src/views/components-demo/editor.vue rename to src/views/other/editor.vue diff --git a/src/views/components-demo/mark-down.vue b/src/views/other/mark-down.vue similarity index 100% rename from src/views/components-demo/mark-down.vue rename to src/views/other/mark-down.vue