소스 검색

no message

kuaifan 5 년 전
부모
커밋
c2960cfddf

+ 1 - 0
.gitignore

@@ -23,3 +23,4 @@ test.js
 test.php
 composer.lock
 package-lock.json
+mix-manifest.json

+ 0 - 2
package.json

@@ -21,9 +21,7 @@
         "stylus": "^0.54.7",
         "stylus-loader": "^3.0.2",
         "vue": "^2.6.11",
-        "vue-loader": "^13.5.0",
         "vue-router": "^3.3.2",
-        "vue-style-loader": "^4.1.2",
         "vue-template-compiler": "^2.6.11"
     },
     "dependencies": {

+ 0 - 4
public/mix-manifest.json

@@ -1,4 +0,0 @@
-{
-    "/js/app.js": "/js/app.js",
-    "/css/app.css": "/css/app.css"
-}

+ 6 - 5
resources/assets/js/main/components/WHeader.vue

@@ -272,11 +272,12 @@
     }
 </style>
 <script>
-    import ImgUpload from "./ImgUpload";
-    import HeaderCreate from "./project/header/create";
-    import HeaderArchived from "./project/header/archived";
-    import ChatIndex from "./chat/Index";
-    import WDrawer from "./iview/WDrawer";
+    const ImgUpload = resolve => require(['./ImgUpload'], resolve);
+    const HeaderCreate = resolve => require(['./project/header/create'], resolve);
+    const HeaderArchived = resolve => require(['./project/header/archived'], resolve);
+    const ChatIndex = resolve => require(['./chat/Index'], resolve);
+    const WDrawer = resolve => require(['./iview/WDrawer'], resolve);
+
     export default {
         name: 'WHeader',
         components: {WDrawer, ChatIndex, HeaderArchived, HeaderCreate, ImgUpload},

+ 4 - 0
resources/assets/js/main/pages/docs.vue

@@ -108,6 +108,8 @@
                 height: 100%;
                 min-height: 500px;
                 .docs-menu {
+                    display: flex;
+                    flex-direction: column;
                     width: 230px;
                     border-radius: 3px 0 0 3px;
                     background: rgba(255, 255, 255, 0.8);
@@ -118,6 +120,8 @@
                         color: #333333;
                     }
                     ul {
+                        flex: 1;
+                        overflow: auto;
                         li {
                             padding: 12px;
                             cursor: pointer;

+ 6 - 6
resources/assets/js/main/pages/docs/edit.vue

@@ -168,14 +168,14 @@
 <script>
     import Vue from 'vue'
     import minder from '../../components/docs/minder'
-    import TEditor from "../../components/TEditor";
-    import Sheet from "../../components/docs/sheet/index";
-    import Flow from "../../components/docs/flow/index";
-    import NestedDraggable from "../../components/docs/NestedDraggable";
-    import WDrawer from "../../components/iview/WDrawer";
-
     Vue.use(minder)
 
+    const TEditor = resolve => require(['../../components/TEditor'], resolve);
+    const Sheet = resolve => require(['../../components/docs/sheet/index'], resolve);
+    const Flow = resolve => require(['../../components/docs/flow/index'], resolve);
+    const NestedDraggable = resolve => require(['../../components/docs/NestedDraggable'], resolve);
+    const WDrawer = resolve => require(['../../components/iview/WDrawer'], resolve);
+
     export default {
         components: {WDrawer, Flow, Sheet, TEditor, NestedDraggable},
         data () {

+ 3 - 3
resources/assets/js/main/pages/todo.vue

@@ -43,7 +43,6 @@
                             </div>
                             <div class="todo-card-content">
                                 <draggable
-                                    v-if="taskDatas[index].lists.length > 0"
                                     v-model="taskDatas[index].lists"
                                     class="content-ul"
                                     group="task"
@@ -61,7 +60,7 @@
                                     </div>
                                     <div v-if="taskDatas[index].hasMorePages === true" class="content-li more" @click="getTaskLists(index, true)">{{$L('加载更多')}}</div>
                                 </draggable>
-                                <div v-else-if="taskDatas[index].loadIng == 0" class="content-empty">{{$L('恭喜你!已完成了所有待办')}}</div>
+                                <div v-if="taskDatas[index].lists.length === 0 && taskDatas[index].loadIng == 0" class="content-empty">{{$L('恭喜你!已完成了所有待办')}}</div>
                                 <div v-if="taskDatas[index].loadIng > 0" class="content-loading"><w-loading></w-loading></div>
                             </div>
                         </div>
@@ -227,6 +226,7 @@
                             .content-ul {
                                 display: flex;
                                 flex-direction: column;
+                                min-height: 20px;
                                 .content-li {
                                     display: flex;
                                     flex-direction: row;
@@ -279,7 +279,7 @@
                                 margin-bottom: 8px;
                             }
                             .content-empty {
-                                margin: 20px auto;
+                                margin: 6px auto;
                                 text-align: center;
                                 color: #666;
                             }