htui-yllkbz 1.4.4 → 1.4.7

package/package.json

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

package/src/packages/HtMenu/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2023-03-20 18:46:48
  * @LastEditors: hutao
- * @LastEditTime: 2023-03-30 17:15:49
+ * @LastEditTime: 2023-03-30 17:38:51
 -->
 <template>
   <el-menu
@@ -16,7 +16,7 @@
   >
     <MenuItem
       :baseUrl="baseUrl"
-      v-for="item in data"
+      v-for="item in menuList"
       :key="item.name"
       :data="item"
     ></MenuItem>
@@ -42,7 +42,7 @@ interface State {
 export default class Index extends Vue {
   /**  通用样式 */
   @Prop() comStyle!: string;
-  @Prop() data!: string;
+  @Prop() data!: any[];
   @Prop() collapse!: string;
   @Prop() baseUrl!: string;
   /** 数据 */
@@ -55,6 +55,9 @@ export default class Index extends Vue {
   created() {
     // console.log('', this.$route, this.$router);
   }
+  get menuList() {
+    return this.data.filter((item) => item.isEnabled && item.position === 1);
+  }
   /** 方法 */
   /** 监听 */
   /** 计算属性 */
@@ -82,7 +85,7 @@ export default class Index extends Vue {
   }
   @Watch('data', { immediate: true })
   getdata(val: any) {
-    //console.log('data', val);
+    console.log('data', val);
   }
 }
 </script>

package/src/packages/HtMenu/menuItem.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2023-03-20 18:47:12
  * @LastEditors: hutao
- * @LastEditTime: 2023-03-30 17:10:36
+ * @LastEditTime: 2023-03-30 17:45:19
 -->
 <template>
   <el-submenu class="ht-menu-list" :index="data.name" v-if="dataLeng">
@@ -15,7 +15,9 @@
 
     <MenuItem
       :baseUrl="baseUrl"
-      v-for="item in data.children"
+      v-for="item in data.children.filter(
+        (item) => item.isEnabled && item.position === 1
+      )"
       :key="item.name"
       :data="item"
     ></MenuItem>
@@ -26,15 +28,17 @@
     :route="setRoute(data).url || '/'"
     :index="!!setRoute(data).url ? data.path : '/'"
   >
-    <i :class="data.icon"></i>
-    <span slot="title">{{ data.displayName }}{{ data.path }}</span>
+    <i :class="data.icon || 'el-icon-menu'"></i>
+    <!-- <i v-else>{{ getFirstName(data.displayName) }}</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>
+      <i :class="data.icon || 'el-icon-menu'" v-if="data.icon"></i>
+      <!-- <i v-else>{{ getFirstName(data.displayName) }}</i> -->
       <span slot="title">{{ data.displayName }}</span>
     </div>
   </el-menu-item>
@@ -71,6 +75,9 @@ export default class Index extends Vue {
       window.location.href = row.path || '';
     }
   }
+  getFirstName(displayName: string) {
+    return displayName.slice(0, 1);
+  }
   /** 设置跳转地址 */
   setRoute(data: MenuDto) {
     const urlArr = data.path ? data.path.split(this.baseUrl) : [];

package/src/packages/HtTable/index.vue

@@ -336,7 +336,7 @@
         <!-- 此处建议使用el-col -->
         <slot name="footerLeft"></slot>
 
-        <el-col :span="12">
+        <el-col :span="$slots['footerLeft'] ? 12 : 24">
           <!-- <p style="width:90px;float:left">共{{data.length}}条</p> -->
           <PageInfo
             :hide-on-single-page="pagination && pagination.hideOnSinglePage"