lw-cdp-ui 1.4.52 → 1.4.53

package/dist/components/lwBiChart/charts/MetricCard.vue

@@ -102,7 +102,7 @@ export default {
 
       // 处理处理高度
       if (!this.height) {
-        this.cardHeight = 200 + (visibleTables.length - 2) * 10 + 'px'
+        this.cardHeight = 200 + (visibleTables.length - 2) * 20 + 'px'
       } else {
         this.cardHeight = this.height
       }

package/dist/components/lwBiChart/charts/PieChart.vue

@@ -138,13 +138,13 @@ export default {
         feature: {
           saveAsImage: toolbox.feature?.saveAsImage?.show
             ? {
-              show: toolbox.feature.saveAsImage.show
-            }
+                show: toolbox.feature.saveAsImage.show
+              }
             : undefined,
           dataView: toolbox.feature?.dataView?.show
             ? {
-              show: toolbox.feature.dataView.show
-            }
+                show: toolbox.feature.dataView.show
+              }
             : undefined
         }
       }

package/dist/components/lwFormMini/ViewItem.vue

@@ -87,7 +87,7 @@
       </template>
       <template v-if="typeof objItem.value == 'object'">
         {{
-          objItem.value.length > 0
+          objItem.value?.length > 0
             ? dayjs(objItem.value[0]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss') +
               ' - ' +
               dayjs(objItem.value[1]).format(item?.options?.valueFormat || 'YYYY-MM-DD HH:mm:ss')

package/dist/components/lwFormMini/index.vue

@@ -1,8 +1,11 @@
 <template>
-  <el-affix v-if="showMenu" :offset="100" z-index="99" style="width: 100%; height: 45px;">
+  <el-affix v-if="showMenu && blackType == 'card'" :offset="83" z-index="99" style="width: 100%; height: 45px">
     <ul class="affix-body">
       <template v-for="(item, index) in config.formItems" :key="index">
-        <a v-if="item.component === 'divider'" class="anchor-link" :class="{ active: affixIndex == item.label }"
+        <a
+          v-if="item.component === 'divider'"
+          class="anchor-link"
+          :class="{ active: affixIndex == item.label }"
           @click="clickAffix(item.label)">
           {{ item.label }}
         </a>
@@ -15,44 +18,92 @@
       <el-radio-button v-for="(card, index) in formItems" :label="card[0].label" :value="index" :key="card[0].label" />
     </el-radio-group>
     <div class="btn-list">
-      <slot :name="formItems[activeIndex][0]?.options?.component"></slot>
+      <slot :name="formItems[activeIndex]?.[0]?.options?.component"></slot>
     </div>
   </div>
 
   <el-skeleton v-if="renderLoading || Object.keys(form).length == 0" animated />
 
-  <el-form v-else ref="form" class="lw-form-mini" :model="form" :label-width="config.labelWidth"
-    :label-position="$i18n.locale == 'en-us' ? 'top' : config.labelPosition" v-loading="loading"
-    :size="config?.size || 'default'" element-loading-text="Loading...">
+  <el-form
+    v-else
+    ref="form"
+    class="lw-form-mini"
+    :model="form"
+    :label-width="config.labelWidth"
+    :label-position="$i18n.locale == 'en-us' ? 'top' : config.labelPosition"
+    v-loading="loading"
+    :size="config?.size || 'default'"
+    element-loading-text="Loading...">
     <template v-for="(card, index) in formItems">
-      <div class="lw-form-mini-card" v-if="isAllHide(card, index)" :key="card[0].label">
+      <div
+        class="lw-form-mini-card"
+        :class="{ 'lw-form-mini-tabs': blackType === 'tabs' }"
+        v-if="isAllHide(card, index)"
+        :key="card[0].label">
         <el-row v-show="activeIndex == index || blackType === 'card'" :gutter="15">
           <template v-for="(item, index) in card">
-            <el-col :span="item.span || 24"
-              v-if="!hideHandle(item) && !(blackType == 'tabs' && item.component == 'divider')" :key="index">
+            <el-col
+              :span="item.span || 24"
+              v-if="!hideHandle(item) && !(blackType == 'tabs' && item.component == 'divider')"
+              :key="index">
               <ViewItem v-if="isView && !item?.options?.isInput" :item="item" :form="form" :index="index">
                 <!-- 没有组件是component值 就是插槽名称 -->
                 <template
-                  v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider', 'tags', 'divider'].includes(item.component)"
+                  v-if="
+                    ![
+                      'input',
+                      'upload',
+                      'checkbox',
+                      'checkboxGroup',
+                      'switch',
+                      'select',
+                      'treeSelect',
+                      'cascader',
+                      'date',
+                      'number',
+                      'radio',
+                      'color',
+                      'rate',
+                      'slider',
+                      'tags',
+                      'divider'
+                    ].includes(item.component)
+                  "
                   v-slot:[item.component]>
                   <slot :name="item.component" :itemCur="item" :formCur="form">
-                    <el-tag type="danger">[{{ item.component }}]
-                      没有这个默认组件也未自定义插槽内容</el-tag>
+                    <el-tag type="danger">[{{ item.component }}] 没有这个默认组件也未自定义插槽内容</el-tag>
                   </slot>
                 </template>
                 <template v-if="item?.options?.component" v-slot:[item?.options?.component]>
                   <slot :name="item?.options?.component"></slot>
                 </template>
-
               </ViewItem>
               <FormItem v-else :item="item" :form="form" :index="index">
                 <!-- 没有组件是component值 就是插槽名称 -->
                 <template
-                  v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider', 'tags', 'divider'].includes(item.component)"
+                  v-if="
+                    ![
+                      'input',
+                      'upload',
+                      'checkbox',
+                      'checkboxGroup',
+                      'switch',
+                      'select',
+                      'treeSelect',
+                      'cascader',
+                      'date',
+                      'number',
+                      'radio',
+                      'color',
+                      'rate',
+                      'slider',
+                      'tags',
+                      'divider'
+                    ].includes(item.component)
+                  "
                   v-slot:[item.component]>
                   <slot :name="item.component" :itemCur="item" :formCur="form">
-                    <el-tag type="danger">[{{ item.component }}]
-                      没有这个默认组件也未自定义插槽内容</el-tag>
+                    <el-tag type="danger">[{{ item.component }}] 没有这个默认组件也未自定义插槽内容</el-tag>
                   </slot>
                 </template>
                 <template v-if="item?.options?.component" v-slot:[item?.options?.component]>
@@ -64,7 +115,6 @@
         </el-row>
       </div>
     </template>
-
   </el-form>
 </template>
 
@@ -77,7 +127,7 @@ export default {
     ViewItem
   },
   props: {
-    modelValue: { type: Object, default: () => { } },
+    modelValue: { type: Object, default: () => {} },
     /**
      * 配置项
      * {
@@ -110,7 +160,7 @@ export default {
      *   ...
      * }
      * **/
-    config: { type: Object, default: () => { } },
+    config: { type: Object, default: () => {} },
     // 是否显示加载中
     loading: { type: Boolean, default: false },
     // 是否是查看模式
@@ -164,7 +214,7 @@ export default {
       const result = []
       let currentGroup = []
 
-      this.config.formItems.forEach(item => {
+      this.config.formItems.forEach((item) => {
         if (item.component === 'divider') {
           if (!this.affixIndex) {
             this.affixIndex = item.label
@@ -203,9 +253,9 @@ export default {
     render(config = this.config) {
       function parse(formItems, form) {
         const result = {}
-        formItems.forEach(item => {
+        formItems.forEach((item) => {
           if (item.component === 'checkbox' || item.component === 'upload') {
-            item.options?.items?.forEach(option => {
+            item.options?.items?.forEach((option) => {
               if (!option?.name) {
                 return false
               }
@@ -338,8 +388,8 @@ export default {
 
       // 创建 IntersectionObserver 观察滚动元素
       const observer = new IntersectionObserver(
-        entries => {
-          entries.forEach(entry => {
+        (entries) => {
+          entries.forEach((entry) => {
             if (entry.isIntersecting && _this.scrollObserverEnabled) {
               const dataIndex = entry.target.getAttribute('data-index')
               _this.affixIndex = dataIndex // 更新 affixIndex
@@ -354,7 +404,7 @@ export default {
       )
 
       // 观察每个 title-name-divider 元素
-      titleNameDividers.forEach(divider => observer.observe(divider))
+      titleNameDividers.forEach((divider) => observer.observe(divider))
 
       // 解绑旧的观察者（防止重复监听）
       if (this.scrollObserver) {
@@ -365,7 +415,7 @@ export default {
     // 是否全隐藏
     isAllHide(card, index) {
       return card.some(
-        item =>
+        (item) =>
           !this.hideHandle(item) &&
           (this.activeIndex == index || this.blackType === 'card') &&
           !(this.blackType == 'tabs' && item.component == 'divider')
@@ -396,7 +446,7 @@ export default {
 }
 
 :deep(.form-item-name-null) {
-  >.el-form-item__label {
+  > .el-form-item__label {
     display: none !important;
   }
 }

package/dist/components/lwFormMini/textToPassword.vue

@@ -1,61 +1,75 @@
 <template>
-  <span class="item-text"
-        :style="{width: textWidth}">
+  <span class="item-text" :style="{ width: textWidth }">
     <!-- 根据加密状态显示加密或解密后的文本 -->
-    <span>{{ isEncrypted ? encryptedText : (modelValue || '--') }}</span>
+    <el-tooltip effect="dark" :content="isEncrypted ? encryptedText : stringValue || '--'" placement="top">
+      <span class="text">{{ isEncrypted ? encryptedText : stringValue || '--' }}</span>
+    </el-tooltip>
     <!-- 切换加密/解密按钮 -->
-    <el-icon v-if="password"
-             class="primary"
-             @click="toggleEncryption"><el-icon-view /></el-icon>
+    <el-icon v-if="password" class="primary" @click="toggleEncryption"><el-icon-view /></el-icon>
   </span>
 </template>
 
 <script>
 export default {
   props: {
-    modelValue: { type: String, default: '' }, // 传入的字符串
+    modelValue: { type: [String, Array, Boolean], default: '' }, // 传入的字符串或数组
     width: { type: String, default: '' },
-    password: { type: Boolean, default: false }, // 是否需要加密显示
+    password: { type: Boolean, default: false } // 是否需要加密显示
   },
   data() {
     return {
-      isEncrypted: this.password, // 根据传入的 password 值初始化加密状态
-    };
+      isEncrypted: this.password // 根据传入的 password 值初始化加密状态
+    }
   },
   computed: {
     encryptedText() {
       // 将输入字符串加密成 *，长度与原字符串相同
-      return "*".repeat(this.modelValue.length);
+      const value = this.stringValue
+      return '*'.repeat(value.length)
     },
     textWidth() {
-      return this?.width ? `calc(100% - ${this.width} - 10px)` : "";
+      return this?.width ? `calc(100% - ${this.width} - 10px)` : ''
+    },
+    stringValue() {
+      // 确保 modelValue 是字符串
+      if (Array.isArray(this.modelValue)) {
+        return this.modelValue.join(', ')
+      }
+      return this.modelValue ? this.modelValue.toString() : ''
     }
   },
   methods: {
     toggleEncryption() {
       // 切换加密和解密状态
-      this.isEncrypted = !this.isEncrypted;
+      this.isEncrypted = !this.isEncrypted
       // 如果是解密状态，可以更新父组件的值
       if (!this.isEncrypted) {
-        this.$emit('update:modelValue', this.modelValue);
+        this.$emit('update:modelValue', this.modelValue)
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .item-text {
   display: inline-flex;
   gap: 10px;
   align-items: center;
+  width: 100%;
   span {
-    word-wrap: break-word;
-    word-break: break-all;
-    white-space: normal;
+    word-wrap: normal;
+    word-break: normal;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
   }
-  .primary{
+  .primary {
     cursor: pointer;
     color: var(--el-color-primary);
   }
 }
-</style>
+:deep(.el-tooltip) {
+  max-width: 200px; // 设置 tooltip 的最大宽度
+}
+</style>

package/dist/components/lwLayout/components/NavMenu.vue

@@ -1,36 +1,44 @@
 <template>
-	<div v-if="navMenus.length<=0" style="padding:20px;">
-		<el-alert title="无子集菜单" center type="info" :closable="false"></el-alert>
-	</div>
-	<template v-for="navMenu in navMenus" v-bind:key="navMenu">
-		<el-menu-item v-if="!hasChildren(navMenu)" :index="navMenu.path">
-			<a v-if="navMenu.meta&&navMenu.meta.type=='link'" :href="navMenu.path" target="_blank" @click.stop='()=>{}'></a>
-			<el-icon v-if="navMenu.meta&&navMenu.meta.icon"><component :is="navMenu.meta.icon || 'el-icon-menu'"/></el-icon>
-			<template #title>
-				<span>{{navMenu.meta.title}}</span>
-			</template>
-		</el-menu-item>
-		<el-sub-menu v-else :index="navMenu.path">
-			<template #title>
-				<el-icon v-if="navMenu.meta&&navMenu.meta.icon"><component :is="navMenu.meta.icon || 'el-icon-menu'"/></el-icon>
-				<span>{{navMenu.meta.title}}</span>
-			</template>
-			<NavMenu :navMenus="navMenu.children"></NavMenu>
-		</el-sub-menu>
-	</template>
+  <div v-if="navMenus.length <= 0" style="padding: 20px">
+    <el-alert title="无子集菜单" center type="info" :closable="false"></el-alert>
+  </div>
+  <template v-for="navMenu in navMenus" v-bind:key="navMenu">
+    <el-menu-item v-if="!hasChildren(navMenu)" :index="navMenu.path">
+      <a
+        v-if="navMenu.meta && navMenu.meta.type == 'link'"
+        :href="navMenu.path"
+        target="_blank"
+        @click.stop="() => {}"></a>
+      <el-icon v-if="navMenu.meta && navMenu.meta.icon">
+        <component :is="navMenu.meta.icon || 'el-icon-menu'" />
+      </el-icon>
+      <template #title>
+        <span>{{ navMenu.meta.title }}</span>
+      </template>
+    </el-menu-item>
+    <el-sub-menu v-else :index="navMenu.path">
+      <template #title>
+        <el-icon v-if="navMenu.meta && navMenu.meta.icon">
+          <component :is="navMenu.meta.icon || 'el-icon-menu'" />
+        </el-icon>
+        <span>{{ navMenu.meta.title }}</span>
+      </template>
+      <NavMenu :navMenus="navMenu.children"></NavMenu>
+    </el-sub-menu>
+  </template>
 </template>
 
 <script>
-	export default {
-		name: 'NavMenu',
-		props: ['navMenus'],
-		data() {
-			return {}
-		},
-		methods: {
-			hasChildren(item) {
-				return item.children && !item.children.every(item => item.meta.hidden)
-			}
-		}
-	}
+export default {
+  name: 'NavMenu',
+  props: ['navMenus'],
+  data() {
+    return {}
+  },
+  methods: {
+    hasChildren(item) {
+      return item.children && !item.children.every((item) => item.meta.hidden)
+    }
+  }
+}
 </script>

package/dist/components/lwLayout/components/tags.vue

@@ -10,7 +10,7 @@
       class="context-menu-list"
       ref="tags"
       itemKey="name">
-      <template #item="{ element: tag, index }" keyName="tag">
+      <template #item="{ element: tag }" keyName="tag">
         <li
           v-bind:key="tag"
           :class="[isActive(tag) ? 'active' : '', tag.meta.affix ? 'affix' : '']"
@@ -358,15 +358,18 @@ export default {
     },
     // 显示ID
     getIdName(tag) {
+      let str = tag.meta.title
+      if (tag.query?.isView) {
+        str = tag.meta.title.replace('编辑', '查看')
+      }
       if (tag.query?.id && this.tagShowID) {
-        let str = tag.meta.title
         if (str.includes(':') || str.includes('：')) {
-          return tag.meta.title
+          return str
         } else {
-          return `${tag.meta.title}:${tag.query.id}`
+          return `${str}:${tag.query.id}`
         }
       } else {
-        return tag.meta.title
+        return str
       }
     },
     // 左滚动

package/dist/components/lwLayout/index.vue

@@ -324,6 +324,7 @@ export default {
     showThis() {
       this.pmenu = this.$route.meta.breadcrumb ? this.$route.meta.breadcrumb[0] : {}
       this.nextMenu = this.filterUrl(this.pmenu.children)
+      
       this.$nextTick(() => {
         this.active = this.$route.meta.active || this.$route.fullPath
       })

package/dist/components/lwSearch/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="lw-search-card">
+  <div v-if="defaultOptions.length > 0" class="lw-search-card">
     <div class="search-content">
       <el-form ref="searchForm" :model="form" @submit.prevent :label-align="labelAlign" style="width: 100%">
         <el-row :class="[isExpandRow ? 'expand-row' : '']" :gutter="10">
@@ -164,18 +164,14 @@ export default {
     // 是否显示展开关闭按钮
     isExpandNumber() {
       let spans = this.options.reduce((sum, item) => sum + (item.span || this.span), 0)
-      return spans - 24 > 0
+      return spans - 18 > 0
     },
     // 是否行内显示按钮
     isExpandRow() {
       const spans = this.options.reduce((sum, item) => sum + (item.span || this.span), 0)
       const remainder = spans % 24
 
-      if (spans > 18) {
-        return !this.isExpandStatus || remainder === 0 || (remainder > 18 && remainder < 24)
-      }
-
-      return false
+      return this.isExpandStatus && remainder == 0
     },
     // 用来兼容旧配置
     defaultOptions() {
@@ -240,7 +236,7 @@ export default {
     // 是否默认展示
     isDefaultShow(index) {
       let span = this.options.slice(0, index + 1).reduce((sum, item) => sum + (item.span || this.span), 0)
-      return span <= 24
+      return span <= 18
     },
     // 切换展开状态
     handleExpandStatus() {
@@ -371,6 +367,9 @@ export default {
         & > span {
           color: #505050;
           font-size: 12px;
+          display: flex;
+          align-items: flex-end;
+          line-height: 14px;
         }
       }
 

package/dist/components/lwTable/components/TableColumn.vue

@@ -10,7 +10,7 @@
     :fixed="col.fixed"
     :sortable="col.sortable"
     :show-overflow-tooltip="col.tooltip">
-    <TableColumn v-for="item in col.children" :col="item" />
+    <TableColumn v-for="(item, index) in col.children" :col="item" :key="index" />
   </el-table-column>
 
   <!-- 子级展开 -->
@@ -159,16 +159,15 @@
             </template>
           </el-image>
         </template>
-
         <!-- 日期转换 -->
         <template v-else-if="col.date">
-          <template v-if="Array.isArray(scope.row[col.dataIndex])">
-            {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+          <template v-if="Array.isArray(getChildName(scope.row, col))">
+            {{ getChildName(scope.row, col) ? formatDate(getChildName(scope.row, col)[0], col.dateFormat) : '--' }}
             到
-            {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex][1]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+            {{ getChildName(scope.row, col) ? formatDate(getChildName(scope.row, col)[1], col.dateFormat) : '--' }}
           </template>
           <template v-else>
-            {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
+            {{ getChildName(scope.row, col) ? formatDate(getChildName(scope.row, col), col.dateFormat) : '--' }}
           </template>
         </template>
 
@@ -324,6 +323,40 @@ export default {
         })
         .filter((label) => label !== '')
       return labels.join(', ') || '--'
+    },
+    /**
+     * 格式化日期
+     * @param {string} dateStr 日期字符串
+     * @param {string} format 指定的格式，如果不指定则自动判断
+     * @returns {string} 格式化后的日期字符串
+     */ formatDate(dateStr, format) {
+      if (!dateStr) return '--'
+      try {
+        const date = dayjs(dateStr)
+        if (!date.isValid()) return '--'
+
+        // 如果指定了格式，就用指定的格式
+        if (format) {
+          return date.format(format)
+        }
+
+        // 否则自动判断格式
+        const origStr = String(dateStr)
+        if (origStr.includes(':')) {
+          // 包含时间
+          if (origStr.includes('.') || origStr.includes('+')) {
+            // 如果包含毫秒或时区信息，只显示到秒
+            return date.format('YYYY-MM-DD HH:mm:ss')
+          }
+          // 否则保持原有的时间精度
+          return date.format('YYYY-MM-DD HH:mm:ss')
+        }
+        // 只有日期
+        return date.format('YYYY-MM-DD')
+      } catch (e) {
+        console.warn('日期格式化失败:', e)
+        return '--'
+      }
     }
   }
 }

package/dist/components/lwTable/index.js

@@ -1,6 +1,6 @@
 import { VueSelecto } from 'vue3-selecto'
-import TableColumn from './components/TableColumn.vue'
 import draggable from 'vuedraggable'
+import TableColumn from './components/TableColumn.vue'
 import { useFullscreen } from './useFullscreen'
 const { isFullscreen, toggle: toggleFullScreen } = useFullscreen()
 export default {
@@ -53,7 +53,7 @@ export default {
       // 表格基础状态
       tableHeaders: [], // 表格列配置
       localTableSize: this.tableSize, // 表格大小
-      tableHeight: this.tableSize, // 表格高度
+      tableHeight: 0, // 表格高度
 
       // 列设置相关
       checkedKeys: [], // 选中的列