hd-idevvue3 3.0.2 → 3.0.4

package/src/views/privilege/exfield/comexfieldsub.vue

@@ -1,72 +1,163 @@
 <template>
   <el-container>
     <el-main>
-
-      <hd-com-grid ref="grid" :hdQuery="hdQuery" url="/webresources/login/tech/ComExField" not-init>
+      <hd-com-grid
+        ref="grid"
+        :hdQuery="hdQuery"
+        url="/webresources/login/tech/ComExField"
+        not-init
+      >
         <div class="filter-container" slot="query">
-          <el-input @keyup.enter.native="doQuery" style="width: 200px;" class="filter-item" placeholder="名称"
-                    v-model="hdQuery.query.anyQuery">
+          <el-input
+            @keyup.enter.native="doQuery"
+            style="width: 200px"
+            class="filter-item"
+            placeholder="名称"
+            v-model="hdQuery.query.anyQuery"
+          >
           </el-input>
-          <el-button class="filter-item" type="primary" icon="search" @click="$refs.grid.doQuery()"  keyType="query">搜索</el-button>
-          <el-button class="filter-item"  @click="doEdit(null)" type="primary" icon="edit" keyType="add">新增
+          <el-button
+            class="filter-item"
+            type="primary"
+            :icon="ElIconSearch"
+            @click="$refs.grid.doQuery()"
+            keyType="query"
+            >搜索</el-button
+          >
+          <el-button
+            class="filter-item"
+            @click="doEdit(null)"
+            type="primary"
+            :icon="ElIconEdit"
+            keyType="add"
+            >新增
           </el-button>
-          <el-button class="filter-item" @click="$refs.grid.doRemoveAll()" type="danger"  keyType="del">删除
+          <el-button
+            class="filter-item"
+            @click="$refs.grid.doRemoveAll()"
+            type="danger"
+            keyType="del"
+            >删除
           </el-button>
         </div>
-        <el-table-column width="100px" align="center" label="操作" fixed="right">
+        <el-table-column
+          width="100px"
+          align="center"
+          label="操作"
+          fixed="right"
+        >
           <template slot-scope="scope">
-            <hd-btn icon="el-icon-edit" hint="编辑" @click.stop="doEdit(scope.row)"></hd-btn>
-            <hd-btn icon="el-icon-delete" hint="删除" @click.stop="$refs.grid.doRemove(scope.row)"></hd-btn>
+            <hd-btn
+              icon="el-icon-edit"
+              hint="编辑"
+              @click.stop="doEdit(scope.row)"
+            ></hd-btn>
+            <hd-btn
+              icon="el-icon-delete"
+              hint="删除"
+              @click.stop="$refs.grid.doRemove(scope.row)"
+            ></hd-btn>
           </template>
         </el-table-column>
-        <el-table-column width="100px" align="center" label="编码" prop="gridCode" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="编码"
+          prop="gridCode"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="是否使用" prop="useFlg" :inputFormat='$ckFt' sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="是否使用"
+          prop="useFlg"
+          :inputFormat="$ckFt"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="表达宽度" prop="formXs" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="表达宽度"
+          prop="formXs"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="表单高度" prop="formSpan" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="表单高度"
+          prop="formSpan"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="列表默认宽度" prop="gridWidth" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="列表默认宽度"
+          prop="gridWidth"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="默认值" prop="defaultValue" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="默认值"
+          prop="defaultValue"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="描述" prop="placeHolder" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="描述"
+          prop="placeHolder"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="center" label="规则" prop="rules" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="规则"
+          prop="rules"
+          sortable
+        >
         </el-table-column>
- <!--       <el-table-column width="100px" align="center" label="对应列" prop="columnId" sortable>
-        </el-table-column>-->
-
-
+        <!--       <el-table-column width="100px" align="center" label="对应列" prop="columnId" sortable>
+            </el-table-column>-->
       </hd-com-grid>
     </el-main>
-    <comexfieldform ref="comexfieldform" @save-ok="$refs.grid.doQuery()"></comexfieldform>
+    <comexfieldform
+      ref="comexfieldform"
+      @save-ok="$refs.grid.doQuery()"
+    ></comexfieldform>
   </el-container>
 </template>
-<script>
-    import comexfieldform from './comexfieldform'
-    export default {
-        name: 'comexfieldsub',
-        components: {  comexfieldform },
-        data() {
-            return {
-                hdQuery: new HdQuery(this),
-            }
-        },
 
-        mounted() {
-
-        },
-        methods: {
-
-            doEdit(row) { // 增加或编辑
-                this.$refs['comexfieldform'].show(row)
-            },
-            query(exColumnId) {
-                this.hdQuery.query.exColumnId = exColumnId;
-                this.$refs.grid.doQuery();
-            }
-        }
+<script>
+import { Search as ElIconSearch, Edit as ElIconEdit } from '@element-plus/icons'
+import comexfieldform from './comexfieldform'
+export default {
+  data() {
+    return {
+      hdQuery: new HdQuery(this),
+      ElIconSearch,
+      ElIconEdit,
     }
+  },
+  name: 'comexfieldsub',
+  components: { comexfieldform },
+  mounted() {},
+  methods: {
+    doEdit(row) {
+      // 增加或编辑
+      this.$refs['comexfieldform'].show(row)
+    },
+    query(exColumnId) {
+      this.hdQuery.query.exColumnId = exColumnId
+      this.$refs.grid.doQuery()
+    },
+  },
+}
 </script>

package/src/views/privilege/index.js

@@ -19,24 +19,23 @@ import comexcolumn from './exfield/comexcolumn.vue'
 
 export default {
   install(Vue) {
-    Vue.component('PrivilegeSyscode', sysfieldframe)
-    Vue.component('PrivilegeMenu', menu)
-    Vue.component('MenuInfo', menuinfo)
-    Vue.component('PrivilegeRole', role)
-    Vue.component('PrivilegeOrgDept', orgDept)
-    Vue.component('PrivilegePersonDept', personDept)
-    Vue.component('PrivilegeUserRole', userRole)
-    Vue.component('PrivilegeComMsg', commsg)
-    Vue.component('PrivilegeComMsgTo', commsgto)
-   // Vue.component('orgTree', orgTree) // 树组件
-    Vue.component('SysLog', syslog) // 日志
-    Vue.component('SysLogConfig', syslogframe) // 日志设置
-    Vue.component('QuartzLog', comquartzlog) //
-    Vue.component('QuartzJob', comquartzjob) //
-    Vue.component('Search', comsearch) //
-    Vue.component('AuthMobileUpdate', authmobileupdate) //
-    Vue.component('ComExField', comexfield) //
-    Vue.component('ComExColumn', comexcolumn) //
-  }
+    window.$vueApp.component('PrivilegeSyscode', sysfieldframe)
+    window.$vueApp.component('PrivilegeMenu', menu)
+    window.$vueApp.component('MenuInfo', menuinfo)
+    window.$vueApp.component('PrivilegeRole', role)
+    window.$vueApp.component('PrivilegeOrgDept', orgDept)
+    window.$vueApp.component('PrivilegePersonDept', personDept)
+    window.$vueApp.component('PrivilegeUserRole', userRole)
+    window.$vueApp.component('PrivilegeComMsg', commsg)
+    window.$vueApp.component('PrivilegeComMsgTo', commsgto)
+    // Vue.component('orgTree', orgTree) // 树组件
+    window.$vueApp.component('SysLog', syslog) // 日志
+    window.$vueApp.component('SysLogConfig', syslogframe) // 日志设置
+    window.$vueApp.component('QuartzLog', comquartzlog) //
+    window.$vueApp.component('QuartzJob', comquartzjob) //
+    window.$vueApp.component('Search', comsearch) //
+    window.$vueApp.component('AuthMobileUpdate', authmobileupdate) //
+    window.$vueApp.component('ComExField', comexfield) //
+    window.$vueApp.component('ComExColumn', comexcolumn) //
+  },
 }
-

package/src/views/privilege/menu/comMenu.vue

@@ -1,41 +1,49 @@
-<template>
-
-  <hd-tree :data="hdTree" v-loading="listLoading" node-key="id" ref="menuTree" style="height: 100%"
-           @node-click="selMenu"></hd-tree>
-
-</template>
-<script>
-
-import btnRole from '../role/btnRole'
-import rolelist from '../role/rolelist'
-
-export default {
-  components: {
-    rolelist, btnRole
-  },
-  name: 'comMenu',
-  data: function() {
-    return {
-      hdTree: [],
-      listLoading: false
-    }
-  },
-  mounted() {
-    this.doQuery()
-  },
-  methods: {
-    doQuery() { // 有权限的菜单树
-      this.listLoading = true
-
-      this.$http.get(`../webresources/login/privilege/AuthRole/findtreeforrole`).then(response => {
-        const data = response.data
-        this.hdTree = data
-        this.listLoading = false
-      })
-    },
-    selMenu(node) {
-      this.$emit('selMenu', node)
-    }
-  }
-}
-</script>
+<template>
+  <hd-tree
+    :data="hdTree"
+    v-loading="listLoading"
+    node-key="id"
+    ref="menuTree"
+    style="height: 100%"
+    @node-click="selMenu"
+  ></hd-tree>
+</template>
+
+<script>
+import btnRole from '../role/btnRole'
+import rolelist from '../role/rolelist'
+
+export default {
+  components: {
+    rolelist,
+    btnRole,
+  },
+  name: 'comMenu',
+  data: function () {
+    return {
+      hdTree: [],
+      listLoading: false,
+    }
+  },
+  mounted() {
+    this.doQuery()
+  },
+  methods: {
+    doQuery() {
+      // 有权限的菜单树
+      this.listLoading = true
+
+      this.$http
+        .get(`../webresources/login/privilege/AuthRole/findtreeforrole`)
+        .then((response) => {
+          const data = response.data
+          this.hdTree = data
+          this.listLoading = false
+        })
+    },
+    selMenu(node) {
+      this.$emit('selMenu', node)
+    },
+  },
+}
+</script>

package/src/views/privilege/menu/menu.vue

@@ -4,86 +4,190 @@
     <!--<hd-hot-key :keyMap="['alt','e']" btnRef="add"></hd-hot-key>-->
     <!--<hd-hot-key :keyMap="['alt','d']" btnRef="del"></hd-hot-key>-->
     <el-aside width="260px" style="border-right: 1px solid #eee">
-      <hd-tree :data="data" @node-click="handleNodeClick" node-key="id"></hd-tree>
+      <hd-tree
+        :data="data"
+        @node-click="handleNodeClick"
+        node-key="id"
+      ></hd-tree>
     </el-aside>
     <el-main>
-
-      <hd-com-grid ref="grid" :hdQuery="hdQuery" url="/webresources/login/privilegeVue" :validate="validate"
-                   :findUrl="findUrl" :findoneUrl="findoneUrl">
+      <hd-com-grid
+        ref="grid"
+        :hdQuery="hdQuery"
+        url="/webresources/login/privilegeVue"
+        :validate="validate"
+        :findUrl="findUrl"
+        :findoneUrl="findoneUrl"
+      >
         <div class="filter-container" slot="query">
-          <el-button class="filter-item" @click="doEdit()" 　type="primary" ref="add" keyType="add">{{$t('新增')}}
+          <el-button
+            class="filter-item"
+            @click="doEdit()"
+            　type="primary"
+            ref="add"
+            keyType="add"
+            >{{ $t('新增') }}
           </el-button>
-          <el-button class="filter-item" @click="$refs.grid.doRemoveAll()" type="danger" ref="del"
-                     keyType="del">{{$t('删除')}}
+          <el-button
+            class="filter-item"
+            @click="$refs.grid.doRemoveAll()"
+            type="danger"
+            ref="del"
+            keyType="del"
+            >{{ $t('删除') }}
           </el-button>
         </div>
         <el-table-column width="60px" align="center" label="操作" fixed="right">
           <template slot-scope="scope">
-            <hd-btn icon="el-icon-edit" hint="编辑" @click.stop="doEdit(scope.row)" v-if="!scope.row.isEdit"></hd-btn>
-            <hd-btn icon="el-icon-check" hint="保存" @click.stop="$refs.grid.doSave(scope.row)" v-if="scope.row.isEdit">
+            <hd-btn
+              icon="el-icon-edit"
+              hint="编辑"
+              @click.stop="doEdit(scope.row)"
+              v-if="!scope.row.isEdit"
+            ></hd-btn>
+            <hd-btn
+              icon="el-icon-check"
+              hint="保存"
+              @click.stop="$refs.grid.doSave(scope.row)"
+              v-if="scope.row.isEdit"
+            >
             </hd-btn>
             <!--hd-btn不能写icon-->
-            <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-delete" hint="删除" @click.stop="$refs.grid.doRemove(scope.row)"
-                    v-if="!scope.row.isEdit">
+            <hd-btn
+              icon="el-icon-delete"
+              hint="删除"
+              @click.stop="$refs.grid.doRemove(scope.row)"
+              v-if="!scope.row.isEdit"
+            >
             </hd-btn>
           </template>
         </el-table-column>
-        <el-table-column width="100px" align="left" header-align="center" label="权限名" prop="text" :rules="$r(1,0,50)"
-                         sortable>
+        <el-table-column
+          width="100px"
+          align="left"
+          header-align="center"
+          label="权限名"
+          prop="text"
+          :rules="$r(1, 0, 50)"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="100px" align="left" header-align="center" label="英文名" prop="enText" sortable>
+        <el-table-column
+          width="100px"
+          align="left"
+          header-align="center"
+          label="英文名"
+          prop="enText"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="400px" align="left" header-align="center" label="URL" prop="url" sortable>
+        <el-table-column
+          width="400px"
+          align="left"
+          header-align="center"
+          label="URL"
+          prop="url"
+          sortable
+        >
         </el-table-column>
-        <el-table-column width="60px" align="right" header-align="center" label="排序" prop="sorter" sortable>
+        <el-table-column
+          width="60px"
+          align="right"
+          header-align="center"
+          label="排序"
+          prop="sorter"
+          sortable
+        >
           <template slot-scope="scope">
-            <el-input type="number" v-model.numebr="scope.row.sorter" v-if="scope.row.isEdit"></el-input>
-            <span v-else>{{scope.row.sorter}}</span>
+            <el-input
+              type="number"
+              v-model.numebr="scope.row.sorter"
+              v-if="scope.row.isEdit"
+            ></el-input>
+            <span v-else>{{ scope.row.sorter }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="使用" prop="state" sortable>
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.state" v-if="scope.row.isEdit" active-value="open"
-                       inactive-value="closed"></el-switch>
-            <span v-else>{{scope.row.state == 'open' ? '√' : '×'}}</span>
+            <el-switch
+              v-model="scope.row.state"
+              v-if="scope.row.isEdit"
+              active-value="open"
+              inactive-value="closed"
+            ></el-switch>
+            <span v-else>{{ scope.row.state == 'open' ? '√' : '×' }}</span>
           </template>
         </el-table-column>
-        <el-table-column width="100px" align="center" label="tab打开" prop="openType" sortable>
+        <el-table-column
+          width="100px"
+          align="center"
+          label="tab打开"
+          prop="openType"
+          sortable
+        >
           <template slot-scope="scope">
             <!--easyui版本为0 tab 1 iframe 2 window-->
-            <el-switch v-model="scope.row.openType" v-if="scope.row.isEdit" active-value="0"
-                       inactive-value="2"></el-switch>
-            <span v-else>{{scope.row.openType == '0' ? '√' : '×'}}</span>
+            <el-switch
+              v-model="scope.row.openType"
+              v-if="scope.row.isEdit"
+              active-value="0"
+              inactive-value="2"
+            ></el-switch>
+            <span v-else>{{ scope.row.openType == '0' ? '√' : '×' }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="left" header-align="center" label="图标" prop="iconCls" width="100px">
+        <el-table-column
+          align="left"
+          header-align="center"
+          label="图标"
+          prop="iconCls"
+          width="100px"
+        >
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.iconCls" v-if="scope.row.isEdit"></el-input>
-            <span v-else>{{scope.row.iconCls}}</span>
+            <el-input
+              type="text"
+              v-model="scope.row.iconCls"
+              v-if="scope.row.isEdit"
+            ></el-input>
+            <span v-else>{{ scope.row.iconCls }}</span>
           </template>
         </el-table-column>
-        <el-table-column width="200px" align="left" header-align="center" label="备注" prop="description" sortable>
+        <el-table-column
+          width="200px"
+          align="left"
+          header-align="center"
+          label="备注"
+          prop="description"
+          sortable
+        >
           <template slot-scope="scope">
-            <el-input type="text" v-model="scope.row.description" v-if="scope.row.isEdit"></el-input>
-            <span v-else>{{scope.row.description}}</span>
+            <el-input
+              type="text"
+              v-model="scope.row.description"
+              v-if="scope.row.isEdit"
+            ></el-input>
+            <span v-else>{{ scope.row.description }}</span>
           </template>
         </el-table-column>
       </hd-com-grid>
     </el-main>
   </el-container>
 </template>
-<script>
 
+<script>
 export default {
   data() {
     return {
       data: [],
       parentId: '', // 选中的树节点
-      hdQuery: new HdQuery(this)
-
+      hdQuery: new HdQuery(this),
     }
   },
   mounted() {
@@ -94,9 +198,11 @@ export default {
   },
   methods: {
     doQuery() {
-      this.$http.post('/webresources/login/privilege/AuthPrivilege/getAllTree').then(response => {
-        this.data = response.data
-      })
+      this.$http
+        .post('/webresources/login/privilege/AuthPrivilege/getAllTree')
+        .then((response) => {
+          this.data = response.data
+        })
     },
     doListQuery() {
       this.hdQuery.query.parentId = this.parentId
@@ -107,27 +213,38 @@ export default {
       this.doListQuery()
     },
     doEdit(row) {
-      if (!row && !this.parentId) { // 新增
+      if (!row && !this.parentId) {
+        // 新增
         this.$message({
           type: 'error',
-          message: this.$t('未选择数据')
+          message: this.$t('未选择数据'),
         })
         return false
       }
       // 调用父组件的
       this.$refs.grid.doEdit(row)
-    }
+    },
   },
-  computed: {// 给外层v-model赋值
+  computed: {
+    // 给外层v-model赋值
     validate() {
-      return { text: [{ message: this.$t('权限名必填'), required: true }, { max: 50, message: this.$t('名称长度不能超过50个字符') }] }
+      return {
+        text: [
+          { message: this.$t('权限名必填'), required: true },
+          { max: 50, message: this.$t('名称长度不能超过50个字符') },
+        ],
+      }
     },
-    findUrl() { // 因为查询的路径和默认的不一致,如果代码生成器生成其实不需要写
+    findUrl() {
+      // 因为查询的路径和默认的不一致,如果代码生成器生成其实不需要写
       return '/webresources/login/privilege/AuthPrivilege/find'
     },
-    findoneUrl() { // 需要关联节点,所以需要写url,普通列表也不需要写
-      return '/webresources/login/privilegeVue/findone?parentId=' + this.parentId
-    }
-  }
+    findoneUrl() {
+      // 需要关联节点,所以需要写url,普通列表也不需要写
+      return (
+        '/webresources/login/privilegeVue/findone?parentId=' + this.parentId
+      )
+    },
+  },
 }
 </script>