merge master

src/data/menus.js

@@ -336,7 +336,38 @@ export default [
                             permission: 'system:role:query'
                         }
                     ]
-                }
+                },
+                // {
+                //     path: '/ren',
+                //     name: '二级页面',
+                //     icon: 'el-icon-fa-user',
+                //     children: [
+                //         {
+                //             path: '/fewfewgf',
+                //             name: '三级页面1-1',
+                //             icon: '',
+                //             opts: [
+                //                 {
+                //                     name: '查看',
+                //                     basic: true,
+                //                     permission: 'system:role:query'
+                //                 }
+                //             ]
+                //         },
+                //         {
+                //             path: '/ledger/cenoteadd',
+                //             name: '三级页面1-2',
+                //             icon: '',
+                //             opts: [
+                //                 {
+                //                     name: '查看',
+                //                     basic: true,
+                //                     permission: 'system:role:query'
+                //                 }
+                //             ]
+                //         }
+                //     ]
+                // }
             ]
         },
         //系统管理

src/framework/layout/PageSidebar.vue

@@ -21,7 +21,19 @@
                         <span>{{menu.name}}</span>
                     </template>
                     <template v-for='submenu in menu.children'>
-                        <el-menu-item :index='submenu.path' :key='submenu.path' class='sidebar-menu-item'>
+                        <el-submenu v-if='submenu.children' :index='submenu.path' :key='submenu.path' class='sidebar-menu-submenu'>
+                            <template slot='title'>
+                                <i v-if='submenu.icon' :class='"el-icon-fa "+ submenu.icon'></i>
+                                <span>{{submenu.name}}</span>
+                            </template>
+                            <template v-for='threemenu in submenu.children'>
+                                <el-menu-item :index='threemenu.path' :key='threemenu.path' class='sidebar-menu-item'>
+                                    <i v-if='threemenu.icon' :class='"el-icon-fa "+ threemenu.icon'></i>
+                                    <span slot='title'>{{threemenu.name}}</span>
+                                </el-menu-item>
+                            </template>
+                        </el-submenu>
+                        <el-menu-item v-else :index='submenu.path' :key='submenu.path' class='sidebar-menu-item'>
                             <i v-if='submenu.icon' :class='"el-icon-fa "+ submenu.icon'></i>
                             <span slot='title'>{{submenu.name}}</span>
                         </el-menu-item>

src/framework/style/theme.scss

@@ -39,11 +39,9 @@ $pageHeaderBackground: #2b3643;
                 background: #364150;
 
                 .sidebar-menu-submenu.el-submenu {
-                    &.is-active {
-                        .el-submenu__title {
-                            background: #36c6d3 !important;
-                            color: $colorWhite !important;
-                        }
+                    &.is-active>.el-submenu__title {
+                        background: #36c6d3 !important;
+                        color: $colorWhite !important;
                     }
                     .el-submenu__title {
                         &:hover {

src/utils/handsontable/notShow.js

@@ -316,95 +316,102 @@ const showTools = {
             if (item.InfoPointCode == "BIMLocation") {
                 return undefined
             }
-            if (item.Visible || !allMess) {
-                //固定不显示的code
-                if (!showTools.cantShow(item.InfoPointCode) && !onlyRead && !taizhang) {
-                    return undefined
-                }
-
-                if (!showTools.isShow(item.InfoPointCode) && !taizhang && !taizhang) {
-                    if (isWatch && !onlyRead) {
+            if (onlyRead || InputModeArr.indexOf(item.InputMode) > -1) {
+                if (item.Visible || !allMess) {
+                    //固定不显示的code
+                    if (!showTools.cantShow(item.InfoPointCode) && !onlyRead && !taizhang) {
                         return undefined
                     }
-                }
 
-                if (item.InfoPointCode == "EquipQRCode") {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        renderer: text.lookQRCode,
-                        readOnly: true
+                    if (!showTools.isShow(item.InfoPointCode) && !taizhang && !taizhang) {
+                        if (isWatch && !onlyRead) {
+                            return undefined
+                        }
                     }
-                }
 
-                if (item.InputMode == "D1") {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        chosenOptions: {
-                            // multiple: true,//多选
-                            data: item.DataSource || ""
+                    if (item.InfoPointCode == "EquipQRCode") {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            renderer: text.lookQRCode,
+                            readOnly: true
                         }
-                    };
-                } else if (item.InputMode == "A1" || item.InputMode == "A2") {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        type: "numeric",
-                        numericFormat: {
-                            pattern: "0,0.00"
-                                // culture: 'de-DE' // use this for EUR (German),
-                                // more cultures available on http://numbrojs.com/languages.html
+                    }
+
+                    if (item.InputMode == "D1") {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            chosenOptions: {
+                                // multiple: true,//多选
+                                data: item.DataSource || ""
+                            }
+                        };
+                    } else if (item.InputMode == "A1" || item.InputMode == "A2") {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            type: "numeric",
+                            numericFormat: {
+                                pattern: "0,0.00"
+                                    // culture: 'de-DE' // use this for EUR (German),
+                                    // more cultures available on http://numbrojs.com/languages.html
+                            }
+                        };
+                    } else if (item.InputMode == "C5") {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            type: "date",
+                            dateFormat: "YYYY-MM-DD",
+                            correctFormat: true
+                        };
+                    } else if (
+                        item.InputMode == "B1" ||
+                        item.InputMode == "L" ||
+                        item.InputMode == "L1" ||
+                        item.InputMode == "L2" ||
+                        item.InputMode == "M"
+                    ) {
+                        return {
+                            data: "Infos." + item.InfoPointCode
+                        };
+                    } else if (
+                        item.InputMode == "X"
+                        // item.InputMode == "L1" ||
+                        // item.InputMode == "L2"
+                    ) {
+                        //   return undefined
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            readOnly: true
+                        };
+                    } else if (item.InputMode == "D2") {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            renderer: tools.customDropdownRenderer,
+                            editor: "chosen",
+                            chosenOptions: {
+                                multiple: true, //多选
+                                data: item.DataSource || ""
+                            }
+                        };
+                    } else if (item.InputMode == "Own" && !onlyRead) {
+                        return {
+                            data: "Infos." + item.InfoPointCode,
+                            renderer: text.idType,
                         }
-                    };
-                } else if (item.InputMode == "C5") {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        type: "date",
-                        dateFormat: "YYYY-MM-DD",
-                        correctFormat: true
-                    };
-                } else if (
-                    item.InputMode == "B1" ||
-                    item.InputMode == "L" ||
-                    item.InputMode == "L1" ||
-                    item.InputMode == "L2" ||
-                    item.InputMode == "M"
-                ) {
-                    return {
-                        data: "Infos." + item.InfoPointCode
-                    };
-                } else if (
-                    item.InputMode == "X"
-                    // item.InputMode == "L1" ||
-                    // item.InputMode == "L2"
-                ) {
-                    //   return undefined
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        readOnly: true
-                    };
-                } else if (item.InputMode == "D2") {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        renderer: tools.customDropdownRenderer,
-                        editor: "chosen",
-                        chosenOptions: {
-                            multiple: true, //多选
-                            data: item.DataSource || ""
+                    } else {
+                        return {
+                            data: "infos." + item.InfoPointCode
                         }
-                    };
-                } else if (item.InputMode == "Own" && !onlyRead) {
-                    return {
-                        data: "Infos." + item.InfoPointCode,
-                        renderer: text.idType,
                     }
                 } else {
-                    return undefined;
+                    return undefined
                 }
             } else {
-                return undefined
+                return false
             }
 
+
         }).filter(item => item);
         return data
     },
@@ -428,7 +435,7 @@ const showTools = {
                         return undefined
                     }
 
-                    if (!showTools.isShow(item.InfoPointCode)) {
+                    if (!showTools.isShow(item.InfoPointCode) && !onlyRead) {
                         if (isWatch && !onlyRead) {
                             return undefined
                         }