htui-yllkbz 1.3.112 → 1.4.1

package/package.json

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

package/src/packages/HtMenu/index.vue

@@ -4,12 +4,12 @@
  * @Author: hutao
  * @Date: 2023-03-20 18:46:48
  * @LastEditors: hutao
- * @LastEditTime: 2023-03-21 19:27:10
+ * @LastEditTime: 2023-03-30 16:04:29
 -->
 <template>
   <el-menu
     class="ht-menu-list"
-    :default-active="state.defaultIndex"
+    :active="state.defaultIndex"
     router
     :collapse="state.collapsed"
     :collapse-transition="false"
@@ -53,11 +53,15 @@ export default class Index extends Vue {
   };
   /** 生命周期 */
   created() {
-    this.state.defaultIndex = window.location.pathname;
+    // console.log('', this.$route, this.$router);
   }
   /** 方法 */
   /** 监听 */
   /** 计算属性 */
+  @Watch('$route.path', { immediate: true })
+  getRoutes() {
+    this.state.defaultIndex = window.location.pathname;
+  }
   @Watch('collapse', { immediate: true })
   getCollapse(val: boolean) {
     this.state.collapsed = val;

package/src/packages/HtMenu/menuItem.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2023-03-20 18:47:12
  * @LastEditors: hutao
- * @LastEditTime: 2023-03-21 19:25:06
+ * @LastEditTime: 2023-03-30 15:59:19
 -->
 <template>
   <el-submenu class="ht-menu-list" :index="data.name" v-if="dataLeng">
@@ -24,7 +24,7 @@
   <el-menu-item
     v-else-if="!dataLeng && setRoute(data).isSelf"
     :route="setRoute(data).url"
-    :index="data.name"
+    :index="!!setRoute(data).url ? data.name : setRoute(data).url"
   >
     <i :class="data.icon"></i>
     <span slot="title">{{ data.displayName }}</span>

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-30 16:04:53
 -->
 <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) : 0,
+        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-03-21 11:09:37
+ * @LastEditTime: 2023-03-30 15:17:48
  */
 /** 初始的默认条数 */
 export const defalutPageSize = 10

package/src/views/Index.vue

@@ -11,7 +11,7 @@
           <HtMenu
             :data="state.menusList"
             :collapse="state.collapsed"
-            baseUrl="/plan-maintenance"
+            baseUrl="/asset-management"
           ></HtMenu>
           <!--导航菜单-->
           <el-menu