1

app/public/js/file_detail.js

@@ -38,20 +38,18 @@ $(document).ready(function() {
             }
         }
         refreshFileCountHint() {
-            const sum = _.sum(this.dragTree.children.map(x => { return x.file_count}));
+            const sum = _.sum(this.dragTree.children.map(x => { return x.total_file_count}));
             $('#file-count').html(`文件总数：${sum}`);
         }
         calcTotalFileCount() {
             this.dragTree.recursiveFun(this.dragTree.children, x => {
                 if (x.children && x.children.length > 0) {
                     x.total_file_count = x.children.reduce((pre, c) => {
-                        if (x.filing_type === 1) console.log('reduce', c.name, c.total_file_count);
                         return pre + c.total_file_count
                     }, 0);
                 } else {
                     x.total_file_count = x.file_count || 0;
                 }
-                if (x.filing_type === 1) console.log(x.name, x.total_file_count);
             });
         }
         _loadFilingSourceNode() {

app/public/js/sub_menu.js

@@ -23,14 +23,14 @@
             miniMenu.addClass('d-flex').show();
             setting.callback({mini: true});
         };
-        const menuType = setting.key ? getLocalCache(setting.key) : null;
+        const menuType = setting.defaultMenu || (setting.key ? getLocalCache(setting.key) : null);
         if ((menuType && menuType === 'miniMenu') || setting.forceMini) {
             showMiniMenu();
         } else {
             showMenu();
         }
         toMenu.click(function () {
-            // if (setting.forceMini) return;
+            if (setting.forceMini) return;
             showMenu();
             if (setting.key) {
                 setLocalCache(setting.key, 'menu');

app/view/tender/index.ejs

@@ -28,7 +28,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/info.ejs

@@ -27,7 +27,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/manage.ejs

@@ -27,7 +27,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');

app/view/tender/progress.ejs

@@ -26,7 +26,7 @@
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
         toMenu: '#to-menu', toMiniMenu: '#to-mini-menu',
         key: 'list.menu.1.0.0',
-        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', forceMini: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
+        miniHint: '#sub-mini-hint', hintKey: 'menu.hint.1.0.1', defaultMenu: <%- !ctx.subProject.page_show.openTenderContract && !ctx.subProject.page_show.openConstruction %>,
         callback: function (info) {
             if (info.mini) {
                 $('.panel-title').addClass('fluid');