htui-yllkbz 1.3.109 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.3.109",
+  "version": "1.4.0",
   "port": "8082",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",

package/src/packages/HtBaseData/index.vue

@@ -863,9 +863,13 @@ export default class CommonDatas extends Vue {
           )
         );
         if (this.parentId) {
-          body[item.id || ''] = body[item.id || ''].filter(
+          const arr = body[item.id || ''].filter(
             (item) => item.id === this.parentId
           );
+          body[item.id || ''] =
+            Array.isArray(arr) && arr.length
+              ? (arr[0].children as BaseDataDto[])
+              : arr;
         }
       } else {
         body[item.id || ''] = this.recursion(

package/src/packages/HtDrawer/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2022-09-28 10:24:08
  * @LastEditors: hutao
- * @LastEditTime: 2023-01-18 13:06:03
+ * @LastEditTime: 2023-03-08 09:41:20
 -->
 <template>
   <el-drawer
@@ -96,7 +96,7 @@ export default class Index extends Vue {
   /** 是否可以通过按下 ESC 关闭 Drawer	 */
   @Prop({ default: false }) closeOnPressEscape!: boolean;
   /** 控制是否在关闭 Drawer 之后将子元素全部销毁	 */
-  @Prop({ default: false }) destroyOnClose!: boolean;
+  @Prop({ default: true }) destroyOnClose!: boolean;
   /** 是否需要遮罩层	 */
   @Prop({ default: true }) modal!: boolean;
   /** Drawer 的自定义类名	 */

package/src/packages/HtMenu/index.ts

@@ -0,0 +1,15 @@
+/*
+ * @Descripttion: 更多三个点功能
+ * @version: 
+ * @Author: hutao
+ * @Date: 2022-04-12 17:34:51
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-03-21 10:50:04
+ */
+
+import HtMenu from "./index.vue";
+(HtMenu as any).install = function (Vue: any) {
+
+  Vue.component("HtMenu", HtMenu);
+};
+export default HtMenu;

package/src/packages/HtMenu/index.vue

@@ -0,0 +1,86 @@
+<!--
+ * @Descripttion: 菜单管理
+ * @version: 
+ * @Author: hutao
+ * @Date: 2023-03-20 18:46:48
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-03-21 19:27:10
+-->
+<template>
+  <el-menu
+    class="ht-menu-list"
+    :default-active="state.defaultIndex"
+    router
+    :collapse="state.collapsed"
+    :collapse-transition="false"
+  >
+    <MenuItem
+      :baseUrl="baseUrl"
+      v-for="item in data"
+      :key="item.name"
+      :data="item"
+    ></MenuItem>
+  </el-menu>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import ElementUI from 'element-ui';
+import MenuItem from './menuItem.vue';
+Vue.use(ElementUI);
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+  collapsed: boolean;
+  defaultIndex: string;
+}
+@Component({
+  name: 'HtMenu',
+  components: {
+    MenuItem,
+  },
+})
+export default class Index extends Vue {
+  /**  通用样式 */
+  @Prop() comStyle!: string;
+  @Prop() data!: string;
+  @Prop() collapse!: string;
+  @Prop() baseUrl!: string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+    defaultIndex: '/',
+    collapsed: false,
+  };
+  /** 生命周期 */
+  created() {
+    this.state.defaultIndex = window.location.pathname;
+  }
+  /** 方法 */
+  /** 监听 */
+  /** 计算属性 */
+  @Watch('collapse', { immediate: true })
+  getCollapse(val: boolean) {
+    this.state.collapsed = val;
+  }
+  @Watch('data', { immediate: true })
+  getdata(val: any) {
+    console.log('data', val);
+  }
+}
+</script>
+<style>
+@import url('/publicData/styles/theme/fonts/element-icons.woff');
+@import url('/publicData/styles/theme/index.css');
+</style>
+<style lang="scss">
+.ht-menu-list {
+  background: none !important;
+  .el-menu {
+    background: none !important;
+  }
+  .el-menu-item {
+    height: 30px !important;
+    line-height: 30px !important;
+  }
+}
+</style>

package/src/packages/HtMenu/menuItem.vue

@@ -0,0 +1,92 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2023-03-20 18:47:12
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-03-21 19:25:06
+-->
+<template>
+  <el-submenu class="ht-menu-list" :index="data.name" v-if="dataLeng">
+    <template slot="title">
+      <i :class="data.icon"></i>
+      <span>{{ data.displayName }}</span>
+    </template>
+
+    <MenuItem
+      :baseUrl="baseUrl"
+      v-for="item in data.children"
+      :key="item.name"
+      :data="item"
+    ></MenuItem>
+  </el-submenu>
+
+  <el-menu-item
+    v-else-if="!dataLeng && setRoute(data).isSelf"
+    :route="setRoute(data).url"
+    :index="data.name"
+  >
+    <i :class="data.icon"></i>
+    <span slot="title">{{ data.displayName }}</span>
+  </el-menu-item>
+  <el-menu-item
+    v-else-if="!dataLeng && !setRoute(data).isSelf"
+    :index="data.name"
+  >
+    <div class="ht-jump" @click.stop="jumpUrl(data)">
+      <i :class="data.icon"> </i>
+      <span slot="title">{{ data.displayName }}</span>
+    </div>
+  </el-menu-item>
+</template>
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-property-decorator';
+import { MenuDto } from '../type';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+}
+@Component({
+  components: {
+    MenuItem: () => import('./menuItem.vue'),
+  },
+})
+export default class Index extends Vue {
+  @Prop() data!: MenuDto;
+  @Prop() baseUrl!: string;
+  /** 数据 */
+  state: State = {
+    loading: false,
+  };
+  /** 生命周期 */
+  created() {
+    //
+  }
+  /** url跳转 */
+  jumpUrl(row: MenuDto) {
+    //window.location.href = row.path || '';
+    if (row.target == '_blank') {
+      window.open(row.path);
+    } else {
+      window.location.href = row.path || '';
+    }
+  }
+  /** 设置跳转地址 */
+  setRoute(data: MenuDto) {
+    const urlArr = data.path ? data.path.split(this.baseUrl) : [];
+
+    if (urlArr && Array.isArray(urlArr) && urlArr.length) {
+      return { url: urlArr[urlArr.length - 1], isSelf: urlArr.length > 1 };
+    } else {
+      return { url: data.path, isSelf: true };
+    }
+  }
+  /** 方法 */
+  /** 监听 */
+  /** 计算属性 */
+  get dataLeng() {
+    return this.data.children && this.data.children.length;
+  }
+}
+</script>
+<style lang="scss" scoped></style>

package/src/packages/HtSelectCategory/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-30 14:29:14
  * @LastEditors: hutao
- * @LastEditTime: 2023-03-07 17:49:04
+ * @LastEditTime: 2023-03-19 19:00:58
 -->
 <template>
   <span v-if="readonly">
@@ -190,7 +190,6 @@ export default class HtSelectUser extends Vue {
           } else {
             nameStr = data[i].displayName;
           }
-
           break;
         } else {
           if (data[i].children) {

package/src/packages/HtTree/index.ts

@@ -0,0 +1,14 @@
+/*
+ * @Descripttion:树结构展示
+ * @version:
+ * @Author: hutao
+ * @Date: 2021-11-15 15:00:57
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-03-08 09:43:23
+ */
+import HtTree from "./index.vue";
+(HtTree as any).install = function (Vue: any) {
+
+  Vue.component("HtTree", HtTree);
+};
+export default HtTree;

package/src/packages/HtTree/index.vue

@@ -0,0 +1,82 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: hutao
+ * @Date: 2023-03-07 09:16:01
+ * @LastEditors: hutao
+ * @LastEditTime: 2023-03-08 10:05:00
+-->
+<template>
+  <ul class="ht-tree ht-tree-ul">
+    <TreeItem
+      @nodeClick="nodeClick"
+      :data="item"
+      v-for="item in dataSource"
+      :key="item.id"
+    >
+      <template slot="title" slot-scope="{ data }">
+        <slot name="title" :data="data"></slot
+      ></template>
+    </TreeItem>
+  </ul>
+</template>
+<script lang="ts">
+import { Component, Vue } from 'vue-property-decorator';
+import TreeItem from './treeItem.vue';
+interface State {
+  /** 数据状态 */
+  loading: boolean;
+}
+@Component({
+  name: 'HtTree',
+  components: { TreeItem },
+})
+export default class Index extends Vue {
+  /** 数据 */
+  state: State = {
+    loading: false,
+  };
+  /** 生命周期 */
+  /** 方法 */
+  /** 点击节点 */
+  nodeClick(data: any) {
+    this.$emit('nodeClick', data);
+  }
+  /** 监听 */
+  /** 计算属性 */
+  get dataSource() {
+    return [
+      {
+        id: 12,
+        name: '电科',
+        children: [
+          { id: 121, name: '张三', children: [{ id: 1211, name: '张三三' }] },
+          { id: 122, name: '张四' },
+          { id: 123, name: '张五' },
+        ],
+      },
+      { id: 13, name: '水科' },
+      { id: 14, name: '气科' },
+      { id: 15, name: '空调科' },
+    ];
+  }
+}
+</script>
+<style lang="scss">
+.ht-tree-ul,
+.ht-tree-li {
+  list-style-type: none;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+.ht-tree-li {
+  min-height: 25px;
+  line-height: 25px;
+  padding-left: 12px;
+  .ht-tree-item-icon {
+    padding: 6px;
+    cursor: pointer;
+  }
+}
+</style>

package/src/packages/HtUpload/index.vue

@@ -94,7 +94,9 @@ interface State {
   dialogVisible: boolean;
   disabled: boolean;
 }
-@Component
+@Component({
+  name: 'HtUpload',
+})
 export default class HtUpload extends Vue {
   /** 是否只显示 */
   @Prop({ default: false }) onlyShow?: boolean;

package/src/packages/PageInfo/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-12-08 11:30:56
  * @LastEditors: hutao
- * @LastEditTime: 2022-08-22 14:28:25
+ * @LastEditTime: 2023-03-24 10:46:35
 -->
 <template>
   <el-pagination
@@ -69,9 +69,9 @@ export default class HtPagination extends Vue {
 
   /** 生命周期 */
   created() {
-    if (this.pageInfo) {
-      this.setpageInfo(this.pageInfo);
-    }
+    // if (this.pageInfo) {
+    //   this.setpageInfo(this.pageInfo);
+    // }
   }
   /** 方法 */
   /** 翻页 */
@@ -88,15 +88,18 @@ export default class HtPagination extends Vue {
     this.handleCurrentChange(1);
   }
   /** 监听 */
-  @Watch('pageInfo')
-  setpageInfo(val: PageInfoType) {
-    const pageInfo: PageInfoType = val;
-    this.state.pageInfo = {
-      currentPage: Number(pageInfo.currentPage),
-      maxResultCount: Number(pageInfo.pageSize),
-      skipCount: Number(pageInfo.skipCount),
-      totalCount: Number(pageInfo.totalCount),
-    };
+  @Watch('pageInfo', { immediate: true })
+  setpageInfo(val?: PageInfoType) {
+    if (val) {
+      console.log('val');
+      const pageInfo: PageInfoType = val;
+      this.state.pageInfo = {
+        currentPage: Number(pageInfo.currentPage) || 1,
+        maxResultCount: Number(pageInfo.pageSize),
+        skipCount: pageInfo.skipCount ? Number(pageInfo.skipCount) : undefined,
+        totalCount: pageInfo.totalCount ? Number(pageInfo.totalCount) : 0,
+      };
+    }
   }
   /** 计算属性 */
 }

package/src/packages/index.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-21 10:08:41
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-01 16:30:54
+ * @LastEditTime: 2023-03-30 15:04:34
  */
 
 // 导入组件
@@ -33,13 +33,14 @@ import HtMore from './HtMore'
 import HtSelectUnit from './HtSelectUnit'
 import HtSelectPosition from './HtSelectPosition'
 import HtSelectCategory from './HtSelectCategory'
+import HtMenu from './HtMenu'
 
 
 
 
 
 // 存储组件列表
-const components = [HtSelectCategory, HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
+const components = [HtMenu, HtSelectCategory, HtSelectUnit, HtSelectPosition, HtMore, HtSelectTimeSlot, HtSelectCron, HtBaseData, HtDrawer, HtShowBaseType, HtSelectTable, HtPagination, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo]
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function (Vue: any) {
   // 判断是否安装
@@ -56,7 +57,7 @@ export default {
   install,
   // 以下是具体的组件列表
   HtSelectTable, HtSelectPosition, HtPagination, HtShowBaseType, HtTable, HtExport, HtUpload, HtMd, HtCountDown, HtUploadFiles, HtMore,
-  HtSelectUnit, HtSelectCategory,
+  HtSelectUnit, HtSelectCategory, HtMenu,
   HtSelectBaseData, HtSelectOrg, HtSelectUser, HtShowBaseData, HtOrgInfo, HtBaseData, HtDrawer, HtSelectCron, HtSelectTimeSlot
 }
 

package/src/packages/type.ts

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-10-25 17:05:17
  * @LastEditors: hutao
- * @LastEditTime: 2023-02-09 13:22:24
+ * @LastEditTime: 2023-03-24 10:46:46
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10
@@ -90,12 +90,37 @@ export interface PageInfoType {
   skipCount: number;
   totalCount: number;
 }
+export interface MenuDto {
+  id?: string;
+  creationTime?: string;
+  creatorId?: string | undefined;
+  lastModificationTime?: string | undefined;
+  lastModifierId?: string | undefined;
+  isDeleted?: boolean;
+  deleterId?: string | undefined;
+  deletionTime?: string | undefined;
+  name?: string | undefined;
+  displayName?: string | undefined;
+  features?: string | undefined;
+  path?: string | undefined;
+  order?: number;
+  description?: string | undefined;
+  icon?: string | undefined;
+  position?: number;
+  isEnabled?: boolean;
+  target?: string | undefined;
+  code?: string | undefined;
+  level?: number;
+  parentId?: string | undefined;
+  children?: MenuDto[] | undefined;
+  childrenCount?: number;
+}
 /** 分页返回时候的分页信息 */
 export interface PageType {
 
   currentPage: number;
   maxResultCount: number;
-  skipCount: number;
+  skipCount?: number;
   totalCount: number;
 
 }

package/src/views/Index.vue

@@ -2,12 +2,17 @@
   <div id="index">
     <el-container style="height: 100vh" class="index">
       <el-header style="padding: 0; height: min-content">
-        <xhkj-layout02 :hide="true">
+        <xhkj-layout02 @leftMenu="leftMenu" :hide="true">
           <router-link to="/login" slot="navEnd">注销</router-link>
         </xhkj-layout02>
       </el-header>
       <el-container class="body">
         <el-aside :width="state.collapsed ? '66px' : '230px'" class="left">
+          <HtMenu
+            :data="state.menusList"
+            :collapse="state.collapsed"
+            baseUrl="/plan-maintenance"
+          ></HtMenu>
           <!--导航菜单-->
           <el-menu
             :default-active="state.defaultIndex"
@@ -55,6 +60,7 @@
 <script lang="ts">
 import { Component, Vue, Watch } from 'vue-property-decorator';
 import { baseConfig } from 'vue-kst-auth';
+import HtMenu from '@/packages/HtMenu/index.vue';
 interface State {
   /** 数据状态 */
   loading: boolean;
@@ -64,19 +70,24 @@ interface State {
   defaultIndex: string;
   /** 菜单是否收缩 */
   collapsed: boolean;
+  menusList: any[];
 }
 
 @Component({
-  components: {},
+  components: { HtMenu },
 })
 export default class App extends Vue {
   /** 数据 */
   state: State = {
     loading: false,
     isLogin: false,
+    menusList: [],
     defaultIndex: '/',
     collapsed: true,
   };
+  leftMenu(e: CustomEvent) {
+    this.state.menusList = e.detail[0];
+  }
   /** 生命周期 */
   created() {
     // 动态加载引用文件