d

iview-admin/src/api/data.js

@@ -68,6 +68,14 @@ export const getOrgs = () => {
   })
 }
 
+export const getFuncs = (appkeyobj) => {
+  return axios.request({
+    url: '/web/common/appCtl/getFuncs',
+    method: 'post',
+    data: appkeyobj
+  })
+}
+
 export const getTreeSelectData = () => {
   return axios.request({
     url: 'get_tree_select_data',

iview-admin/src/router/routers.js

@@ -114,6 +114,15 @@ export default [
           title: '路由信息'
         },
         component: () => import('@/view/appinfo/routeinfo_page.vue')
+      },
+      {
+        path: 'functree_info',
+        name: 'functree_info',
+        meta: {
+          icon: 'md-clipboard',
+          title: '功能清单'
+        },
+        component: () => import('@/view/appinfo/functree_page.vue')
       }
     ]
   },

iview-admin/src/store/module/metainfo/dict.js

@@ -5,8 +5,7 @@ export default {
         "authType": {"add": "新增", "edit": "编辑","delete":"删除","export":"导出","show":"查看"},
         "opstatus": {"0": "失败", "1": "成功"},
         "sex": {"male": "男", "female": "女"},
-        "configType": {"price": "宝币兑换率", "initGift": "初次赠送","apiInitGift":"API初次赠送","apiCallPrice":"api调用价格"},
         "logLevel": {"debug": 0, "info": 1, "warn": 2, "error": 3, "fatal": 4},
         "msgType": { "sys": "系统", "single": "单点", "multi": "群发" },
-        "node_type":{"org":"组织","arc":"文档"}
+        "node_type":{"org":"组织","arc":"文档"},
 }
\ No newline at end of file

iview-admin/src/view/appinfo/appinfo_page.vue

 <template>
-  <PageSpace @sizechange="sizechange">
-     <template v-slot:default="{adjustHeight}">
-        <BizTable
-          ref="bt"
-          :formatCol="formatCol"
-          metaName="app_info"
-          packageName="common"
-          :tblheight="adjustHeight-120"
-          isMulti
-          :refvalidatemethod="validmethod"
-          @onexec="onexec"
-          :savebefore="beforesave"
-          :editbefore="beforedit"
-          :addbefore="beforeadd"
-        ></BizTable>
-     </template>
+  <PageSpace>
+    <template v-slot:default="{adjustHeight}">
+      <BizTable
+        ref="bt"
+        :formatCol="formatCol"
+        metaName="app_info"
+        packageName="common"
+        :tblheight="adjustHeight-120"
+        isMulti
+        :refvalidatemethod="validmethod"
+        @onexec="onexec"
+        :savebefore="beforesave"
+        :editbefore="beforedit"
+        :addbefore="beforeadd"
+      ></BizTable>
+    </template>
   </PageSpace>
 </template>
   <script>
@@ -30,11 +30,8 @@ export default {
     BizTable
   },
   methods: {
-    sizechange(h){
-       console.log(h)
-    },
     beforeadd(row, cbk) {
-     return cbk({ value: true, message: null });
+      return cbk({ value: true, message: null });
     },
     beforedit(row, cbk) {
       return cbk({ value: true, message: null });
@@ -42,7 +39,14 @@ export default {
     beforesave(key, row, cbk) {
       return cbk(row);
     },
-    onexec(k, row) {},
+    onexec(k, row) {
+      if (k == "func") {
+        this.$router.push({
+          name: "functree_info",
+          query: { appkey: row.appkey}
+        });
+      }
+    },
     validmethod(rule, value, callback) {
       if (rule.field == "functionJSON") {
         try {

iview-admin/src/view/appinfo/functree_page.vue

+<template>
+  <OrgEditor
+    ref="functree"
+    :initData="initData()"
+    :metainfo="metainfo"
+    @controlctl="controlctl"
+    @drawaction="drawaction"
+    @modisave="orgsave"
+    @deletenode="orgsave"
+    @onselnode="onselnode"
+  ></OrgEditor>
+</template>
+  <script>
+import { getApp, saveAuths, findAuthsByRoles } from "@/api/meta";
+import { saveFormData, getFuncs } from "@/api/data";
+import OrgEditor from "@/view/components/tables/forms/jsoneditor.vue";
+import config from "@/config";
+export default {
+  name: "treeinfo_page",
+  props: {},
+  components: {
+    OrgEditor
+  },
+  data() {
+    return {
+      appkey: "",
+      metainfo: {
+        name: "节点编辑",
+        main: [
+          {
+            title: "可授权范围",
+            key: "baseinfo",
+            cols: 2,
+            ctls: [
+              {
+                type: "checkgroup",
+                dicName: "authType",
+                label: "权限",
+                prop: "auths",
+                labelField: "name",
+                valueField: "id",
+                style: {},
+                isHide: false
+              }
+            ]
+          }
+        ],
+        lists: null
+      }
+    };
+  },
+  mounted() {
+    this.appkey = this.$route.query.appkey;
+  },
+  methods: {
+    onselnode(root, node, data) {},
+    orgsave(treedata, modidata) {
+      saveFormData("/web/common/appCtl/saveFuncTree", {
+        funcJson: treedata,
+        curdata: modidata,
+        appkey: this.appkey
+      }).then(res => {
+        let rtn = res.data;
+        console.log("ddddddddddddddddd", rtn);
+        if (rtn.status == 0) {
+          let treedata2 = rtn.data.funcJson;
+          console.log("save org...............................", treedata2);
+          this.$refs.functree.treedata = treedata2;
+          this.$refs.functree.refreshTree();
+          this.$Message.success("当前操作成功完成");
+        } else {
+        }
+      });
+    },
+    drawaction(v, fm) {},
+    controlctl(v, prop, fm) {},
+    initData() {
+      let self=this
+      let pappkey= self.appkey
+      return cbk => {
+        getFuncs({ appkey: pappkey }).then(res => {
+          let rtn = res.data;
+          if (rtn.status == 0) {
+            let treedata2 = rtn.data.funcJson;
+            cbk(treedata2);
+          } else {
+            throw new Error("获取功能清单数据出错");
+          }
+        });
+      };
+    }
+  }
+};
+</script>
+  <style>
+</style>

iview-admin/src/view/components/pagespace/page_space.vue

@@ -30,11 +30,10 @@ export default {
          let $framediv = $("#framediv");
       let el = $framediv.get()[0];
       let h = window.innerHeight - el.offsetTop-this.advalue;
-
-         this.frameHeight=h
+      this.frameHeight=h
+        this.$emit("sizechange",this.frameHeight)
       })
-      console.log("h.............................",h)
-      this.$emit("sizechange",this.frameHeight)
+    
     }
   }
 };

iview-admin/src/view/components/tables/forms/jsoneditor.vue

@@ -293,12 +293,12 @@ export default {
       //按照当前公司加载组织结构,如果数据为空，那么就初始化一个根实体对象
       if (this.initData && this.treedata.length==0) {
         this.initData(originalData => {
-          if (
+          if((
             originalData &&
             originalData[0] &&
             (!originalData.children ||
               (originalData.children && originalData.children.length == 0))
-          ) {
+          ) || (originalData && originalData.length==0) || (!originalData)){
             this.originalRoot = Object.assign(
               this.originalRoot,
               originalData[0]

iview-admin/src/view/roleinfo/roleinfo_page.vue

 <template>
-  <div>
+    <PageSpace>
+    <template v-slot:default="{adjustHeight}">
     <BizTable
       ref="bt"
       :formatCol="formatCol"
+      :tblheight="adjustHeight-120"
       metaName="role_info"
       packageName="auth"
       isMulti
       @onexec="onexec"
       :savebefore="savebefore"
+      :editbefore="beforedit"
+      :addbefore="beforeadd"
     ></BizTable>
-  </div>
+      </template>
+  </PageSpace>
 </template>
   <script>
 import BizTable from "../components/tables/biztables";
+import PageSpace from "@/view/components/pagespace/page_space.vue";
 export default {
   name: "roleinfo_page",
   data() {
     return {};
   },
   components: {
-    BizTable
+    BizTable,
+    PageSpace
   },
   methods: {
-    savebefore(key,row,cbk){
-       return cbk(row)
+    savebefore(key, row, cbk) {
+      return cbk(row);
+    },
+    beforeadd(row, cbk) {
+      return cbk({ value: true, message: null });
+    },
+    beforedit(row, cbk) {
+      return cbk({ value: true, message: null });
+    },
+    beforesave(key, row, cbk) {
+      return cbk(row);
     },
     onexec(k, row) {
-      if(k=="auth"){
-        this.$router.push({ name: "role_auth",query:{roleid:row.id,rolecode:row.code}})
+      if (k == "auth") {
+        this.$router.push({
+          name: "role_auth",
+          query: { roleid: row.id, rolecode: row.code }
+        });
       }
-
     },
     // onnew() {
     //   this.$refs.bt.setFormCtlVisable("userName", true);

iview-admin/src/view/userinfo/orginfo_page.vue

 <template>
-  <div id="orgdiv">
+   <PageSpace>
+    <template v-slot:default="{adjustHeight}">
     <SplitPanel>
       <OrgEditor
         slot="left"
@@ -15,15 +16,18 @@
       <UserInfo
         ref="userinfo"
         slot="right"
+        :tblheight="adjustHeight-60"
         :beforesave="beforesave"
         :beforedit="beforedit"
         :beforeadd="beforeadd"
       ></UserInfo>
     </SplitPanel>
-  </div>
+        </template>
+  </PageSpace>
 </template>
   <script>
 import { getApp, saveAuths, findAuthsByRoles } from "@/api/meta";
+import PageSpace from "@/view/components/pagespace/page_space.vue";
 import { saveFormData, getOrgs } from "@/api/data";
 import OrgEditor from "@/view/components/tables/forms/jsoneditor.vue";
 import SplitPanel from "@/view/components/split-pane2/split-pane2.vue";
@@ -35,7 +39,8 @@ export default {
   components: {
     OrgEditor,
     SplitPanel,
-    UserInfo
+    UserInfo,
+    PageSpace
   },
   data() {
     return {
@@ -98,15 +103,7 @@ export default {
     };
   },
   mounted() {
-    this.$nextTick(() => {
-      this.setHeight();
-    });
-
-    $(window).resize(() => {
-      this.$nextTick(() => {
-        this.setHeight();
-      });
-    });
+ 
   },
   methods: {
     onselnode(root,node,data){

iview-admin/src/view/userinfo/userinfo_page.vue

@@ -5,6 +5,7 @@
       :formatCol="formatCol"
       metaName="user_info"
       packageName="auth"
+     :tblheight="tblheight"
       isMulti
       @onnew="onnew"
       @onedit="onedit"
@@ -25,6 +26,7 @@ export default {
     BizTable
   },
   props: {
+    tblheight:Number,
     beforesave: {
       type: Function,
       default() {