hd-idevvue3 3.0.3 → 3.0.4

package/src/views/privilege/role/btnRole.vue

@@ -1,117 +1,173 @@
 <template>
   <el-container style="padding-top: 5px">
     <el-main>
-      <hd-com-grid ref="grid" :hdQuery="hdQuery" :findUrl="findUrl"
-                   removeAllUrl="/webresources/login/privilege/AuthResource/removeBtn"
-                   findoneUrl="/webresources/login/privilege/AuthResource/findone"
-                   :saveoneUrl="saveoneUrl"
-                   noSets pageHide recHide notInit>
+      <hd-com-grid
+        ref="grid"
+        :hdQuery="hdQuery"
+        :findUrl="findUrl"
+        removeAllUrl="/webresources/login/privilege/AuthResource/removeBtn"
+        findoneUrl="/webresources/login/privilege/AuthResource/findone"
+        :saveoneUrl="saveoneUrl"
+        noSets
+        pageHide
+        recHide
+        notInit
+      >
         <div class="filter-container" slot="query">
-          <el-button class="filter-item" @click="$refs.grid.doEdit('')" type="primary" keyType="add">{{$t('新增')}}
+          <el-button
+            class="filter-item"
+            @click="$refs.grid.doEdit('')"
+            type="primary"
+            keyType="add"
+            >{{ $t('新增') }}
           </el-button>
-          <el-button class="filter-item" @click="$refs.grid.doRemoveAll()" type="danger" keyType="del">{{$t('删除')}}
+          <el-button
+            class="filter-item"
+            @click="$refs.grid.doRemoveAll()"
+            type="danger"
+            keyType="del"
+            >{{ $t('删除') }}
           </el-button>
-          <el-button class="filter-item" @click="doInit()" type="danger">{{$t('按钮扫描')}}
+          <el-button class="filter-item" @click="doInit()" type="danger"
+            >{{ $t('按钮扫描') }}
           </el-button>
         </div>
         <el-table-column width="90" align="center" label="操作" fixed="right">
           <template slot-scope="scope">
-            <hd-btn icon="el-icon-edit" hint="编辑" @click.stop="$refs.grid.doEdit(scope.row)" v-if="!scope.row.isEdit">{{$t('编辑')}}
+            <hd-btn
+              icon="el-icon-edit"
+              hint="编辑"
+              @click.stop="$refs.grid.doEdit(scope.row)"
+              v-if="!scope.row.isEdit"
+              >{{ $t('编辑') }}
             </hd-btn>
-            <hd-btn hint="撤销" @click.stop="$refs.grid.doCancel(scope.row,scope.$index)" v-if="scope.row.isEdit">
-              <svg-icon icon-class="undo"/>
+            <hd-btn
+              hint="撤销"
+              @click.stop="$refs.grid.doCancel(scope.row, scope.$index)"
+              v-if="scope.row.isEdit"
+            >
+              <svg-icon icon-class="undo" />
             </hd-btn>
-            <hd-btn icon="el-icon-check" hint="保存" @click.stop="doSave(scope.row)" v-if="scope.row.isEdit">
+            <hd-btn
+              icon="el-icon-check"
+              hint="保存"
+              @click.stop="doSave(scope.row)"
+              v-if="scope.row.isEdit"
+            >
             </hd-btn>
           </template>
         </el-table-column>
         <el-table-column width="90" align="center" label="使用">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.useFlg" active-value="1" inactive-value="0"
-                       @change="updateBtn(scope.row)"></el-switch>
+            <el-switch
+              v-model="scope.row.useFlg"
+              active-value="1"
+              inactive-value="0"
+              @change="updateBtn(scope.row)"
+            ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column width="120px" align="center" label="名称" prop="name" sortable>
+        <el-table-column
+          width="120px"
+          align="center"
+          label="名称"
+          prop="name"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="220px" align="center" label="区分标识" prop="permissions" sortable>
+        <el-table-column
+          width="220px"
+          align="center"
+          label="区分标识"
+          prop="permissions"
+          sortable
+        >
         </el-table-column>
-
       </hd-com-grid>
       <component :is="menuUrl" v-show="false" ref="compurl"></component>
     </el-main>
   </el-container>
 </template>
+
 <script>
-  export default {
-    components: {},
-    name: 'btnRole',
-    data() {
-      return {
-        hdQuery: new HdQuery(this),
-        findUrl: '',
-        saveoneUrl: '',
-        menuUrl: ''
-      }
+export default {
+  components: {},
+  name: 'btnRole',
+  data() {
+    return {
+      hdQuery: new HdQuery(this),
+      findUrl: '',
+      saveoneUrl: '',
+      menuUrl: '',
+    }
+  },
+  props: ['menu', 'roleId', 'imFromPro'], // imFromPro:import不能来自node_module,需要项目传入
+  mounted() {
+    this.initCom()
+  },
+  methods: {
+    doQuery() {
+      this.findUrl = `/webresources/login/privilege/AuthResource/showBtn?menuId=${this.menu.id}&roleId=${this.roleId}`
+      this.$refs.grid.doQuery()
     },
-    props: ['menu', 'roleId', 'imFromPro'], // imFromPro:import不能来自node_module,需要项目传入
-    mounted() {
-      this.initCom()
+    doSave(row) {
+      this.saveoneUrl = `/webresources/login/privilege/AuthResource/saveBtn?menuId=${this.menu.id}`
+      this.$refs.grid.doSave(row)
     },
-    methods: {
-      doQuery() {
-        this.findUrl = `/webresources/login/privilege/AuthResource/showBtn?menuId=${this.menu.id}&roleId=${this.roleId}`
-        this.$refs.grid.doQuery()
-      },
-      doSave(row) {
-        this.saveoneUrl = `/webresources/login/privilege/AuthResource/saveBtn?menuId=${this.menu.id}`
-        this.$refs.grid.doSave(row)
-      },
-      initCom() {
-        this.doQuery()// 这里列表展示
-        this.$route.meta.btnRole = []
-        this.menuUrl = () => this.imFromPro(this.menu.url)
-      },
-      doInit() {
-        this.listLoading = true
-        this.$http.post(`/webresources/login/privilege/AuthResource/initBtn?menuId=${this.menu.id}`, this.$route.meta.btnRole).then(response => {
+    initCom() {
+      this.doQuery() // 这里列表展示
+      this.$route.meta.btnRole = []
+      this.menuUrl = () => this.imFromPro(this.menu.url)
+    },
+    doInit() {
+      this.listLoading = true
+      this.$http
+        .post(
+          `/webresources/login/privilege/AuthResource/initBtn?menuId=${this.menu.id}`,
+          this.$route.meta.btnRole
+        )
+        .then((response) => {
           this.listLoading = false
           const data = response.data
           this.$message({
             type: data.code == '-1' ? 'error' : 'success',
             showClose: true,
             duration: 1500,
-            message: data.message
+            message: data.message,
           })
           if (data.code == '-1') {
             return
           }
           this.doQuery()
         })
-      },
-      updateBtn(row) {
-        this.$set(row, 'checked', row.checked)
-        row.menuId = this.menu.id
-        row.roleId = this.roleId
-        this.$http.post(`/webresources/login/privilege/AuthResource/setBtn?menuId=${this.menu.id}&roleId=${this.roleId}&resourceId=${row.resourceId}&useFlg=${row.useFlg}`).then(response => {
+    },
+    updateBtn(row) {
+      this.$set(row, 'checked', row.checked)
+      row.menuId = this.menu.id
+      row.roleId = this.roleId
+      this.$http
+        .post(
+          `/webresources/login/privilege/AuthResource/setBtn?menuId=${this.menu.id}&roleId=${this.roleId}&resourceId=${row.resourceId}&useFlg=${row.useFlg}`
+        )
+        .then((response) => {
           const data = response.data
           this.$message({
             type: data.code == '-1' ? 'error' : 'success',
             message: data.message,
             showClose: true,
-            duration: 1500
+            duration: 1500,
           })
         })
-      }
     },
-    watch: {// 初始化时,不会执行watch,所以需要在mounted
-      'menu.id': function () {
-        this.initCom()
-      },
-      roleId: function () {
-        this.initCom()
-      }
-    }
-
-  }
-
+  },
+  watch: {
+    // 初始化时,不会执行watch,所以需要在mounted
+    'menu.id': function () {
+      this.initCom()
+    },
+    roleId: function () {
+      this.initCom()
+    },
+  },
+}
 </script>

package/src/views/privilege/role/menuRole.vue

@@ -1,64 +1,84 @@
 <template>
-  <div style="height: 100%;">
-    <el-button class="filter-item" type="success" @click="save" size="mini">{{$t('保存')}}</el-button>
-    <hd-tree :data="hdTree" v-loading="listLoading" node-key="id" ref="menuTree"
-             show-checkbox style="height: calc(100% - 30px);"></hd-tree>
+  <div style="height: 100%">
+    <el-button class="filter-item" type="success" @click="save" size="mini">{{
+      $t('保存')
+    }}</el-button>
+    <hd-tree
+      :data="hdTree"
+      v-loading="listLoading"
+      node-key="id"
+      ref="menuTree"
+      show-checkbox
+      style="height: calc(100% - 30px)"
+    ></hd-tree>
   </div>
 </template>
-<script>
 
-  import btnRole from './btnRole'
+<script>
+import btnRole from './btnRole'
 
-  import rolelist from './rolelist'
+import rolelist from './rolelist'
 
-  export default {
-    components: {
-      rolelist, btnRole
-    },
-    name: 'menuRole',
-    data: function () {
-      return {
-        hdTree: [],
-        listLoading: false
-      }
-    },
-    mounted() { // 因为外层通过v-if控制
-      this.doQuery()
-    },
-    methods: {
-      doQuery() {
-        this.listLoading = true
+export default {
+  components: {
+    rolelist,
+    btnRole,
+  },
+  name: 'menuRole',
+  data: function () {
+    return {
+      hdTree: [],
+      listLoading: false,
+    }
+  },
+  mounted() {
+    // 因为外层通过v-if控制
+    this.doQuery()
+  },
+  methods: {
+    doQuery() {
+      this.listLoading = true
 
-        this.$http.get(`../webresources/login/privilege/AuthRole/findtreeforrole?roleId=${this.roleId}`).then(response => {
+      this.$http
+        .get(
+          `../webresources/login/privilege/AuthRole/findtreeforrole?roleId=${this.roleId}`
+        )
+        .then((response) => {
           const data = response.data
           this.hdTree = data
           this.listLoading = false
         })
-      },
-      save() {
-        const os = this.$refs.menuTree.getCheckedNodes()
-        let privilegeIds = ''
-        for (let i = 0; i < os.length; i++) {
-          if (os[i].id == -1) { // 总根节点不处理
-            continue
-          }
-          privilegeIds = privilegeIds + os[i].id + ','
+    },
+    save() {
+      const os = this.$refs.menuTree.getCheckedNodes()
+      let privilegeIds = ''
+      for (let i = 0; i < os.length; i++) {
+        if (os[i].id == -1) {
+          // 总根节点不处理
+          continue
         }
-        this.$http.post(`../webresources/login/privilege/AuthRole/updatePermission/${this.roleId}`, {ids: privilegeIds}).then(response => {
+        privilegeIds = privilegeIds + os[i].id + ','
+      }
+      this.$http
+        .post(
+          `../webresources/login/privilege/AuthRole/updatePermission/${this.roleId}`,
+          { ids: privilegeIds }
+        )
+        .then((response) => {
           const data = response.data
           this.$message({
             type: data.code == '-1' ? 'error' : 'success',
-            message: data.message
+            message: data.message,
           })
         })
-      }
     },
-    props: ['roleId'],
-    watch: {
-      // 如果 `roleId` 发生改变，这个函数就会运行
-      roleId: function (newVal) {
-        this.doQuery()
-      }
-    }
-  }
+  },
+  props: ['roleId'],
+  watch: {
+    // 如果 `roleId` 发生改变，这个函数就会运行
+    roleId: function (newVal) {
+      this.doQuery()
+    },
+  },
+}
 </script>

package/src/views/privilege/role/orgnRole.vue

@@ -1,56 +1,78 @@
 <template>
-  <div style="height: 100%;">
-    <el-button @click="saveOrgnTree" class="filter-item" size="mini" type="success">{{$t('保存')}}</el-button>
-    <hd-tree :data="hdTree" height="100%" node-key="id" ref="orgnTree" show-checkbox
-             style="height: 100%" v-loading="listLoading"></hd-tree>
+  <div style="height: 100%">
+    <el-button
+      @click="saveOrgnTree"
+      class="filter-item"
+      size="mini"
+      type="success"
+      >{{ $t('保存') }}</el-button
+    >
+    <hd-tree
+      :data="hdTree"
+      height="100%"
+      node-key="id"
+      ref="orgnTree"
+      show-checkbox
+      style="height: 100%"
+      v-loading="listLoading"
+    ></hd-tree>
   </div>
 </template>
-<script>
 
-  export default {
-    name: 'orgnRole',
-    data: function () {
-      return {
-        hdTree: [],
-        listLoading: false
-      }
-    },
-    mounted() {
-      this.doQuery()
-    },
-    methods: {
-      doQuery() {
-        this.listLoading = true
-        this.$http.get(`../webresources/login/privilege/AuthRole/findOrgnByRoleAndPrivilege?roleId=${this.roleId}&privilegeId=${this.menuId}`).then(response => {
+<script>
+export default {
+  name: 'orgnRole',
+  data: function () {
+    return {
+      hdTree: [],
+      listLoading: false,
+    }
+  },
+  mounted() {
+    this.doQuery()
+  },
+  methods: {
+    doQuery() {
+      this.listLoading = true
+      this.$http
+        .get(
+          `../webresources/login/privilege/AuthRole/findOrgnByRoleAndPrivilege?roleId=${this.roleId}&privilegeId=${this.menuId}`
+        )
+        .then((response) => {
           const data = response.data
           this.hdTree = data
           this.listLoading = false
         })
-      },
-      saveOrgnTree() {
-        const os = this.$refs.orgnTree.getCheckedNodes(false)
-        let orgIds = ''
-        for (let i = 0; i < os.length; i++) {
-          orgIds = orgIds + os[i].id + ','
-        }
-        this.$http.post(`../webresources/login/privilege/AuthRole/vue/updateRoleOrgn/${this.roleId}/${this.menuId}`, {ids: orgIds}).then(response => {
+    },
+    saveOrgnTree() {
+      const os = this.$refs.orgnTree.getCheckedNodes(false)
+      let orgIds = ''
+      for (let i = 0; i < os.length; i++) {
+        orgIds = orgIds + os[i].id + ','
+      }
+      this.$http
+        .post(
+          `../webresources/login/privilege/AuthRole/vue/updateRoleOrgn/${this.roleId}/${this.menuId}`,
+          { ids: orgIds }
+        )
+        .then((response) => {
           const data = response.data
           this.$message({
             type: data.code == '-1' ? 'error' : 'success',
-            message: data.message
+            message: data.message,
           })
         })
-      }
     },
-    props: ['roleId', 'menuId'],
-    watch: {
-      // 都有值才适合查询
-      roleId: function (newVal) {
-        this.doQuery()
-      },
-      menuId: function (newVal) {
-        this.doQuery()
-      }
-    }
-  }
+  },
+  props: ['roleId', 'menuId'],
+  watch: {
+    // 都有值才适合查询
+    roleId: function (newVal) {
+      this.doQuery()
+    },
+    menuId: function (newVal) {
+      this.doQuery()
+    },
+  },
+}
 </script>

package/src/views/privilege/role/role.vue

@@ -6,25 +6,37 @@
     <el-main>
       <el-tabs v-model="activeName">
         <el-tab-pane :label="$t('菜单')" name="menu">
-          <menuRole :roleId="roleId" v-if="activeName=='menu'&&roleId"></menuRole>
+          <menuRole
+            :roleId="roleId"
+            v-if="activeName == 'menu' && roleId"
+          ></menuRole>
         </el-tab-pane>
         <el-tab-pane :label="$t('数据')" name="data">
-          <el-container v-if="activeName=='data'">
+          <el-container v-if="activeName == 'data'">
             <el-aside width="30%">
               <comMenu @selMenu="selMenu"></comMenu>
             </el-aside>
             <el-main>
-              <orgnRole :roleId="roleId" :menuId="menu.id" v-if="roleId&&menu.url"></orgnRole>
+              <orgnRole
+                :roleId="roleId"
+                :menuId="menu.id"
+                v-if="roleId && menu.url"
+              ></orgnRole>
             </el-main>
           </el-container>
         </el-tab-pane>
         <el-tab-pane :label="$t('按钮')" name="btn">
-          <el-container v-if="activeName=='btn'">
+          <el-container v-if="activeName == 'btn'">
             <el-aside width="30%">
               <comMenu @selMenu="selMenu"></comMenu>
             </el-aside>
             <el-main>
-              <btnRole :roleId="roleId" :menu="menu" v-if="roleId&&menu.url" :imFromPro="imFromPro"></btnRole>
+              <btnRole
+                :roleId="roleId"
+                :menu="menu"
+                v-if="roleId && menu.url"
+                :imFromPro="imFromPro"
+              ></btnRole>
             </el-main>
           </el-container>
         </el-tab-pane>
@@ -32,6 +44,7 @@
     </el-main>
   </el-container>
 </template>
+
 <script>
 import btnRole from './btnRole'
 import rolelist from './rolelist'
@@ -41,14 +54,18 @@ import comMenu from '../menu/comMenu'
 
 export default {
   components: {
-    orgnRole, rolelist, menuRole, btnRole, comMenu
+    orgnRole,
+    rolelist,
+    menuRole,
+    btnRole,
+    comMenu,
   },
   name: 'role',
   data() {
     return {
       roleId: null,
       menu: {},
-      activeName: 'menu'
+      activeName: 'menu',
     }
   },
   props: ['imFromPro'], // imFromPro:import不能来自node_module,需要项目传入
@@ -61,7 +78,7 @@ export default {
     },
     selMenu(menu) {
       this.menu = menu
-    }
-  }
+    },
+  },
 }
 </script>