ap-dev 1.2.1 → 1.2.2

package/dev/ApiPanel/index.vue

@@ -12,13 +12,24 @@
             <div v-if="showCustom">
                 <component :is="customComponent" />
             </div>
-            <div v-html="doc" v-if="showDoc" class="api-doc ap-doc">
+            <div ref="docRef1" v-html="doc" v-if="showDoc" class="api-doc ap-doc">
             </div>
             <el-tabs v-if="showTabs" v-model="tabActiveName" tabPosition="left" class="api-tabs sap-dev-api" @tab-click="clickTabEvent">
                 <template v-for="(item,index) in tabs">
-                    <el-tab-pane :label="item.fdName" :name="item.fdCustom != null && item.fdCustom != '' && item.fdCustom != undefined ? '##' + item.fdCustom : item.fdId" :id="item.fdId" class="api-tab">
-                        <div v-if="!showTabsCustom" v-html="doc" class="api-doc ap-doc"></div>
-                        <component v-else :is="customComponent" />
+                    <el-tab-pane :label="item.fdName" :name="getTabName(item)" :id="item.fdId" class="api-tab">
+                        <el-tabs v-if="showTopTabs" v-model="toptabActiveName" type="card" @tab-click="clickTopTabEvent">
+                            <template v-for="(item2,index2) in topTabs">
+                                <el-tab-pane :label="item2.fdName" :name="getTabName(item2)">
+                                    <div ref="docRef2" v-if="!showTopTabsCustom" v-html="doc" class="api-doc ap-doc"></div>
+                                    <component v-else :is="customComponent" />
+                                </el-tab-pane>
+                            </template>
+                        </el-tabs>
+
+                        <div v-else>
+                            <div ref="docRef3" v-if="!showTabsCustom" v-html="doc" class="api-doc ap-doc"></div>
+                            <component v-else :is="customComponent" />
+                        </div>
                     </el-tab-pane>
                 </template>
             </el-tabs>
@@ -55,12 +66,17 @@ export default {
             showDoc: false,
             showTabs: false,
             showTabsCustom: false,
+            showTopTabs: false,
+            showTopTabsCustom: false,
             tabActiveName: "",
             tabs: [],
             doc: "",
             currentComponent: 'ApiLog',
             imgSrc: [],
             clickTime: null,
+            // ----- 右上侧 -----
+            toptabActiveName: null,
+            topTabs: [], // 左侧顶部
         }
     },
     methods: {
@@ -69,6 +85,7 @@ export default {
             let treeOptions = {
                 showTitle: false,
                 onClick: (data, node, comp) => {
+                    this.scrollTop();
                     this.selectedDocTypeId = data.fdId;
                     this.hideContentFn();
                     // 自定义组件
@@ -134,21 +151,69 @@ export default {
                 this.loading = false;
             })
         },
+        getTabName(obj){
+            // 分组
+            if (obj.fdType == 1) {
+                return '%%' + obj.fdId;
+            }
+            // 自定义组件
+            if( obj.fdCustom != null && obj.fdCustom != '' && obj.fdCustom != undefined ) {
+                return '##' + obj.fdCustom;
+            } else {
+                // 文档Id
+                return obj.fdId;
+            }
+        },
         clickTabEvent(tab) {
+            this.scrollTop();
             let name = tab._props.name;
+            // 左上菜单
+            if (name.startsWith('%%')) {
+                this.$request({
+                    url: '/apd/dev/DevDoc/getDocGroup',
+                    method: 'post',
+                    data: {
+                        id: name.substring(2, name.length)
+                    }
+                }).then(response => {
+                    this.topTabs = response.data
+                })
+                this.showTopTabsFn();
+                return;
+            }
+            // 自定义组件
             if (name.startsWith('##')) {
                 this.showTabsCustom = true;
+                this.showTopTabs = false;
                 this.customComponent = name.substring(2, name.length);
-            } else {
-                this.showTabsCustom = false;
-                this.selectedDocTypeId = name;
-                this.getDocText();
+                return;
             }
 
+            // 文档
+            this.showTabsCustom = false;
+            this.showTopTabs = false;
+            this.selectedDocTypeId = name;
+            this.getDocText();
+
+        },
+        clickTopTabEvent(tab) {
+            this.scrollTop();
+            let name = tab._props.name;
+            // 自定义组件
+            if (name.startsWith('##')) {
+                this.showTopTabsCustom = true;
+                this.customComponent = name.substring(2, name.length);
+                return;
+            }
+            // 文档
+            this.showTopTabsCustom = false;
+            this.selectedDocTypeId = name;
+            this.getDocText();
         },
         hideContentFn() {
             this.showDoc = false;
             this.showTabs = false;
+            this.showTopTabs = false;
             this.doc = "";
             this.tabActiveName = "";
         },
@@ -156,16 +221,33 @@ export default {
             this.showCustom = true;
             this.showDoc = false;
             this.showTabs = false;
+            this.showTopTabs = false;
         },
         showDocFn() {
             this.showCustom = false;
             this.showDoc = true;
             this.showTabs = false;
+            this.showTopTabs = false;
         },
         showTabsFn() {
             this.showCustom = false;
             this.showDoc = false;
             this.showTabs = true;
+            this.showTopTabs = false;
+        },
+        showTopTabsFn() {
+            this.showCustom = false;
+            this.showDoc = false;
+            this.showTabs = true;
+            this.showTopTabs = true;
+        },
+        scrollTop(){
+            // 回到顶部
+            let ctn = document.getElementsByClassName('el-tabs__content')
+            if (ctn != null && ctn.length <1) {
+                return;
+            }
+            ctn[0].scrollTop = 0;
         },
         addImgClick(){
             // 添加图片点击事件，双击查看大图

package/dev/DevDoc/index.vue

@@ -27,7 +27,8 @@
                     <el-form-item label='布局' prop='fdLayout'>
                         <el-select v-model="tDevDocTypeForm.fdLayout" filterable placeholder="请选择布局">
                             <el-option key="one" label="单页" value="one"></el-option>
-                            <el-option key="left" label="左侧" value="left"></el-option>
+                            <el-option key="left" label="左侧(二级)" value="left"></el-option>
+                            <el-option key="lefttop" label="左上(三级)" value="lefttop"></el-option>
                         </el-select>
                     </el-form-item>
                     <el-form-item label='自定义组件' prop='fdCustom' placeholder="请输入自定义组件名">

package/dev/OperatePanel/index.vue

@@ -48,6 +48,21 @@
             </div>
         </div>
         <div class="flex">
+<!--            <div class="ap-dev-tool-item flex flex-center">-->
+<!--                <div class="ap-dev-tool-item-icon1">-->
+<!--                    <i class="el-icon-vue"/>-->
+<!--                </div>-->
+<!--                <el-dropdown  trigger="click"  @command="clickEvent">-->
+<!--                  <span class="el-dropdown-link ap-dev-tool-item-text1">-->
+<!--                    {{ currentModel }}<i class="el-icon-caret-bottom"/>-->
+<!--                  </span>-->
+<!--                    <el-dropdown-menu slot="dropdown">-->
+<!--                        <el-dropdown-item :command="{name:'AP'}">AP中台</el-dropdown-item>-->
+<!--                        <el-dropdown-item :command="{name:'MES'}">MES</el-dropdown-item>-->
+<!--                        <el-dropdown-item :command="{name:'ABAP'}">SAP-ABAP</el-dropdown-item>-->
+<!--                    </el-dropdown-menu>-->
+<!--                </el-dropdown>-->
+<!--            </div>-->
             <div class="ap-dev-tool-item flex flex-center" @click="currentDesignPanel('config-panel', $event)">
                 <div class="ap-dev-tool-item-icon">
                     <i class="el-icon-setting"/>
@@ -61,12 +76,19 @@
 <script>
 import ApDevBase from './../CustomPanel/items/base/ApDevBase'
 import {addClass, removeClass} from 'ap-util/util/StyleUtil'
+import {setCurrentCompanyId} from "ap-util/util/LoginUserUtil";
 
 export default {
     name: 'OperatePanel',
     extends: ApDevBase,
     data() {
-        return {}
+        return {
+        }
+    },
+    computed: {
+        currentModel() {
+            return this.$store.state.tempData.currentModel
+        }
     },
     methods: {
         currentDesignPanel(type, event) {
@@ -77,6 +99,13 @@ export default {
             }
             addClass( event.currentTarget,"ap-dev-tool-item-active");
             this.$store.commit('updateCurrentDesignPanel', type);
+        },
+        clickEvent(item) {
+            this.currentModel = item.name;
+            this.$store.commit('updateCurrentModel', item.name);
+        },
+        showMenu(type){
+            return this.currentModel == type;
         }
     }
 }

package/dev/dev/devStore.js

@@ -83,7 +83,8 @@ const apDevStore = new Vuex.Store({
     },
     tempData: {
       copyItem: {},
-      currentDesignPanel: 'api-panel'
+      currentDesignPanel: 'api-panel',
+      currentModel: 'AP'
     }
   },
   strict: true,
@@ -350,6 +351,10 @@ const apDevStore = new Vuex.Store({
     // 更新当前设计的页面
     updateCurrentDesignPanel(state, param) {
       state.tempData.currentDesignPanel = param
+    },
+    // 更新当前设计的页面
+    updateCurrentModel(state, param) {
+      state.tempData.currentModel = param
     }
 
 

package/dev/dev/index.vue

@@ -36,7 +36,7 @@ export default {
         DbDesignPanel,
         ConfigPanel,
         OnlineCodePanel,
-        DevDoc
+        DevDoc,
     },
     store: apDevStore,
     data() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ap-dev",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "===== ap-dev =====",
   "author": "xiexinbin",
   "email": "876818817@qq.com",