Merge pull request #201 from TaleLin/feature/linCmsUi

新增 Dialog 组件及 Timeline 组件

Author: vanoneang

src/assets/styles/realize/element-variables.scss

@@ -325,27 +325,12 @@ thead tr {
   font-size: 18px;
   top: -5px;
 }
-
-// dialog
-.el-dialog__footer {
-  text-align: left;
-  padding-left: 30px;
-}
-
+// el-dialog
 .el-dialog__title {
   color: $parent-title-color;
   font-size: 16px;
   font-weight: 500;
 }
-
-.el-dialog__header {
-  padding-left: 30px;
-}
-
-.el-dialog__body {
-  padding: 30px;
-}
-
 // tab
 .el-tabs__item.is-active {
   color: $theme;

src/config/stage/plugins.js

@@ -1,10 +1,10 @@
 // 本文件是自动生成, 请勿修改
-import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
 import custom from '@/plugins/custom/stage-config'
+import LinCmsUi from '@/plugins/LinCmsUi/stage-config'
 
 const pluginsConfig = [
-  LinCmsUi,
   custom,
+  LinCmsUi,
 ]
 
 export default pluginsConfig

src/plugins/LinCmsUi/stage-config.js

@@ -273,7 +273,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/TimePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
         {
           title: 'DateTimePicker 日期时间选择器',
@@ -283,7 +283,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/DateTimePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
         {
           title: 'DatePicker 日期选择器',
@@ -293,7 +293,7 @@ const LinCmsUiRouter = {
           filePath: 'plugins/LinCmsUi/views/form/DatePicker.vue',
           inNav: true,
           icon: 'iconfont icon-jiemiansheji',
-
+          right: null,
         },
       ],
     },
@@ -339,6 +339,38 @@ const LinCmsUiRouter = {
         },
       ],
     },
+    {
+      title: 'Others',
+      type: 'folder',
+      name: null,
+      route: '/lin-cms-ui/others/base',
+      filePath: 'plugins/LinCmsUi/views/others/',
+      inNav: true,
+      icon: 'iconfont icon-jiemiansheji',
+      right: null,
+      children: [
+        {
+          title: 'Dialog 对话框',
+          type: 'view',
+          name: null,
+          route: '/lin-cms-ui/other/dialog',
+          filePath: 'plugins/LinCmsUi/views/other/Dialog.vue',
+          inNav: true,
+          icon: 'iconfont icon-jiemiansheji',
+          right: null,
+        },
+        {
+          title: 'Timeline 时间线',
+          type: 'view',
+          name: null,
+          route: '/lin-cms-ui/other/timeline',
+          filePath: 'plugins/LinCmsUi/views/other/Timeline.vue',
+          inNav: true,
+          icon: 'iconfont icon-jiemiansheji',
+          right: null,
+        },
+      ],
+    },
   ],
 }
 

src/plugins/LinCmsUi/views/data/progress/Progress.vue

@@ -107,4 +107,8 @@ export default {
 
 <style lang="scss" scoped>
 @import '../../../assets/style/container';
+.el-progress {
+  margin-top:20px;
+  margin-left: 20px;
+}
 </style>