lw-cdp-ui 1.4.38 → 1.4.40

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

@@ -183,6 +183,8 @@ export default {
                   ? index == 0
                     ? setting?.title?.text || `${header}-${metricName}`
                     : `${header}-${metricName}`
+                  : index == 0
+                  ? setting?.title?.text || metricName
                   : metricName,
               unit: table.unit,
               unitName: table.unitName,

package/dist/components/lwFormMini/FormItem.vue

@@ -285,7 +285,6 @@ export default {
 }
 :deep(.el-form-item__label) {
   position: relative;
-  display: inline-block;
   > .el-tooltip__trigger {
     position: absolute;
     right: 0;

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

@@ -1,28 +1,50 @@
 <template>
   <!-- 递归渲染子列 -->
-  <el-table-column v-if="col.children && col.children.length" :prop="col.dataIndex" :label="col.title"
-    :width="col.width" :min-width="col.minWidth" :align="col.align ?? 'center'" :fixed="col.fixed"
-    :sortable="col.sortable" :show-overflow-tooltip="col.tooltip">
+  <el-table-column
+    v-if="col.children && col.children.length"
+    :prop="col.dataIndex"
+    :label="col.title"
+    :width="col.width"
+    :min-width="col.minWidth"
+    :align="col.align ?? 'center'"
+    :fixed="col.fixed"
+    :sortable="col.sortable"
+    :show-overflow-tooltip="col.tooltip">
     <TableColumn v-for="item in col.children" :col="item" />
   </el-table-column>
 
   <!-- 子级展开 -->
-  <el-table-column v-else-if="col.expand" :prop="col.dataIndex" :label="col.title" type="expand" :width="col.width"
-    :min-width="col.minWidth" :align="col.align ?? 'center'" :fixed="col.fixed" :sortable="col.sortable"
+  <el-table-column
+    v-else-if="col.expand"
+    :prop="col.dataIndex"
+    :label="col.title"
+    type="expand"
+    :width="col.width"
+    :min-width="col.minWidth"
+    :align="col.align ?? 'center'"
+    :fixed="col.fixed"
+    :sortable="col.sortable"
     :show-overflow-tooltip="col.tooltip">
     <template #default="scope">
       <!-- 自定义组件 -->
       <template v-if="col.component">
         <slot :name="col.component" :scope="scope.row" :col="col">
-          <el-tag type="danger">[{{ col.component }}]
-            没有这个默认组件也未自定义插槽内容</el-tag>
+          <el-tag type="danger">[{{ col.component }}] 没有这个默认组件也未自定义插槽内容</el-tag>
         </slot>
       </template>
     </template>
   </el-table-column>
 
-  <el-table-column v-else :prop="col.dataIndex" :label="col.title" :width="col.width" :min-width="col.minWidth"
-    :align="col.align ?? 'center'" :fixed="col.fixed" :sortable="col.sortable" :show-overflow-tooltip="col.tooltip">
+  <el-table-column
+    v-else
+    :prop="col.dataIndex"
+    :label="col.title"
+    :width="col.width"
+    :min-width="col.minWidth"
+    :align="col.align ?? 'center'"
+    :fixed="col.fixed"
+    :sortable="col.sortable"
+    :show-overflow-tooltip="col.tooltip">
     <!-- 表头插槽 -->
     <template #header="{ column, $index }">
       <slot v-if="col?.header" :name="col.header" :scope="{ column, $index, col }">
@@ -32,7 +54,7 @@
         {{ col.title }}
         <el-tooltip v-if="col.tips">
           <template #content>
-            <span style="max-width: 300px; display: inline-block;">{{ col.tips }}</span>
+            <span style="max-width: 300px; display: inline-block">{{ col.tips }}</span>
           </template>
           <el-icon>
             <component :is="col.icon || 'el-icon-question-filled'" />
@@ -49,12 +71,22 @@
           <template v-for="op in filterOperations(col.operation, scope.row)" :key="op">
             <!-- 图标按钮 -->
             <el-tooltip v-if="op.icon" :content="op.label" placement="top">
-              <el-button type="primary" size="small" :icon="op.icon" :disabled="op.disabled?.(scope.row)" circle
+              <el-button
+                type="primary"
+                size="small"
+                :icon="op.icon"
+                :disabled="op.disabled?.(scope.row)"
+                circle
                 @click="op.clickFun(scope.row, scope.$index, tableData)" />
             </el-tooltip>
 
             <!-- 文字按钮 -->
-            <el-button v-else type="primary" text size="small" :disabled="op.disabled?.(scope.row)"
+            <el-button
+              v-else
+              type="primary"
+              text
+              size="small"
+              :disabled="op.disabled?.(scope.row)"
               @click="op.clickFun(scope.row, scope.$index, tableData)">
               {{ op.label }}
             </el-button>
@@ -66,11 +98,21 @@
           <!-- 显示前2个按钮 -->
           <template v-for="op in filterOperations(col.operation, scope.row).slice(0, 2)" :key="op">
             <el-tooltip v-if="op.icon" :content="op.label" placement="top">
-              <el-button type="primary" size="small" :icon="op.icon" :disabled="op.disabled?.(scope.row)" circle
+              <el-button
+                type="primary"
+                size="small"
+                :icon="op.icon"
+                :disabled="op.disabled?.(scope.row)"
+                circle
                 @click="op.clickFun(scope.row, scope.$index, tableData)" />
             </el-tooltip>
 
-            <el-button v-else type="primary" text size="small" :disabled="op.disabled?.(scope.row)"
+            <el-button
+              v-else
+              type="primary"
+              text
+              size="small"
+              :disabled="op.disabled?.(scope.row)"
               @click="op.clickFun(scope.row, scope.$index, tableData)">
               {{ op.label }}
             </el-button>
@@ -80,7 +122,9 @@
             <el-button size="small" type="primary" icon="el-icon-more-filled" class="el-dropdown-link" text></el-button>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item v-for="op in filterOperations(col.operation, scope.row).slice(2)" :key="op"
+                <el-dropdown-item
+                  v-for="op in filterOperations(col.operation, scope.row).slice(2)"
+                  :key="op"
                   @click="op.clickFun(scope.row, scope.$index, tableData)">
                   {{ op.label }}
                 </el-dropdown-item>
@@ -94,14 +138,20 @@
       <template v-else>
         <!-- 自定义渲染 -->
         <template v-if="col.eleRender">
-          <span v-html="col.eleRender(scope.row, scope.$index)"
+          <span
+            v-html="col.eleRender(scope.row, scope.$index)"
             @click="col.clickFun?.(scope.row, scope.$index, tableData)" />
         </template>
 
         <!-- 图片列 -->
         <template v-else-if="col.type === 'img'">
-          <el-image style="height: 28px;" :src="scope.row[col.dataIndex] || empty"
-            :preview-src-list="[scope.row[col.dataIndex]]" fit="cover" :z-index="99" :preview-teleported="true">
+          <el-image
+            style="height: 28px"
+            :src="scope.row[col.dataIndex] || empty"
+            :preview-src-list="[scope.row[col.dataIndex]]"
+            fit="cover"
+            :z-index="99"
+            :preview-teleported="true">
             <template #error>
               <div class="image-slot">
                 <el-icon><el-icon-picture /></el-icon>
@@ -120,16 +170,24 @@
           <template v-else>
             {{ scope.row[col.dataIndex] ? dayjs(scope.row[col.dataIndex]).format('YYYY-MM-DD HH:mm:ss') : '--' }}
           </template>
-
         </template>
 
         <!-- 开关 -->
         <template v-else-if="col.switch">
-          <el-switch :inline-prompt="true" :active-text="col.activeText || '是'" :inactive-text="col.inactiveText || '否'"
+          <el-switch
+            :inline-prompt="true"
+            :active-text="col.activeText || '是'"
+            :inactive-text="col.inactiveText || '否'"
             style="--el-switch-on-color: var(--el-color-primary); --el-switch-off-color: #c6c6c6"
-            v-model="scope.row[col.dataIndex]" :active-value="col.activeValue ?? true"
-            :inactive-value="col.inactiveValue ?? false" :disabled="col.disabled ? col.disabled(scope.row) : false"
-            @change="(v) => { col.clickFun(v, scope.row) }" />
+            v-model="scope.row[col.dataIndex]"
+            :active-value="col.activeValue ?? true"
+            :inactive-value="col.inactiveValue ?? false"
+            :disabled="col.disabled ? col.disabled(scope.row) : false"
+            @change="
+              (v) => {
+                col.clickFun(v, scope.row)
+              }
+            " />
         </template>
 
         <!-- 视频 -->
@@ -145,18 +203,25 @@
         <!-- 自定义组件 -->
         <template v-else-if="col.component">
           <slot :name="col.component" :scope="scope.row" :col="col">
-            <el-tag type="danger">[{{ col.component }}]
-              没有这个默认组件也未自定义插槽内容</el-tag>
+            <el-tag type="danger">[{{ col.component }}] 没有这个默认组件也未自定义插槽内容</el-tag>
           </slot>
         </template>
 
         <!-- 枚举 options -->
         <template v-else-if="col.options?.length">
           <template v-if="col?.isEdit">
-            <el-select class="select-select number" v-model="scope.row[col.dataIndex]" placeholder="请选择" clearable
-              filterable @change="(val) => col.callback?.(val, scope.row)">
-              <el-option v-for="item in col.options" :key="item[col.optionsValue || 'value']"
-                :label="item[col.optionsLabel || 'label']" :value="item[col.optionsValue || 'value']" />
+            <el-select
+              class="select-select number"
+              v-model="scope.row[col.dataIndex]"
+              placeholder="请选择"
+              clearable
+              filterable
+              @change="(val) => col.callback?.(val, scope.row)">
+              <el-option
+                v-for="item in col.options"
+                :key="item[col.optionsValue || 'value']"
+                :label="item[col.optionsLabel || 'label']"
+                :value="item[col.optionsValue || 'value']" />
             </el-select>
           </template>
           <template v-else>
@@ -166,8 +231,11 @@
 
         <!-- 链接跳转 -->
         <template v-else-if="col.link">
-          <span class="el-button el-button--primary el-button--small is-text"
-            @click="col.clickFun?.(scope.row, scope.$index, tableData)"> {{ scope.row[col.dataIndex] || '' }}</span>
+          <span
+            class="el-button el-button--primary el-button--small is-text"
+            @click="col.clickFun?.(scope.row, scope.$index, tableData)">
+            {{ scope.row[col.dataIndex] || '' }}</span
+          >
         </template>
 
         <!-- 其他简单渲染 -->
@@ -182,7 +250,6 @@
       </template>
     </template>
   </el-table-column>
-
 </template>
 
 <script>
@@ -208,7 +275,7 @@ export default {
      */
     filterOperations(operations, row) {
       return (
-        operations?.filter(o => {
+        operations?.filter((o) => {
           const hasAuth = !o.auth || this.checkAuth(o.auth)
           const isVisible = !o.isShow || o.isShow(row)
           return hasAuth && isVisible
@@ -224,7 +291,7 @@ export default {
 
       if (!auth) return true
       if (Array.isArray(auth)) {
-        return auth.some(permission => allPermissions.includes(permission))
+        return auth.some((permission) => allPermissions.includes(permission))
       }
       return allPermissions.includes(auth)
     },
@@ -251,11 +318,11 @@ export default {
       let values = Array.isArray(value) ? value : typeof value === 'string' ? value.split(',') : [value]
       // 获取匹配的 labels
       let labels = values
-        .map(val => {
-          const option = options.find(opt => opt[optionsValue] == val)
+        .map((val) => {
+          const option = options.find((opt) => opt[optionsValue] == val)
           return option ? option[optionsLabel] : ''
         })
-        .filter(label => label !== '')
+        .filter((label) => label !== '')
       return labels.join(', ') || '--'
     }
   }
@@ -273,7 +340,6 @@ export default {
 }
 
 .btn-list {
-
   :deep(.el-button + .el-button),
   :deep(.el-button + .el-dropdown) {
     margin-left: 0px;

package/dist/lw-cdp-ui.esm.js

@@ -1193,7 +1193,7 @@ function o5(e, t, n, r, a, o) {
     _: 3
   }, 8, ["prop", "label", "width", "min-width", "align", "fixed", "sortable", "show-overflow-tooltip"]));
 }
-const i5 = /* @__PURE__ */ ae(Ju, [["render", o5], ["__scopeId", "data-v-13993311"]]);
+const i5 = /* @__PURE__ */ ae(Ju, [["render", o5], ["__scopeId", "data-v-23665983"]]);
 function l5() {
   const e = Ft(!1), t = (o) => {
     o.requestFullscreen ? o.requestFullscreen() : o.mozRequestFullScreen ? o.mozRequestFullScreen() : o.webkitRequestFullscreen ? o.webkitRequestFullscreen() : o.msRequestFullscreen && o.msRequestFullscreen();
@@ -6791,7 +6791,7 @@ function y8(e, t, n, r, a, o) {
     _: 3
   }, 8, ["class", "prop", "rules"]));
 }
-const B4 = /* @__PURE__ */ ae(h8, [["render", y8], ["__scopeId", "data-v-5f42e108"]]), b8 = {
+const B4 = /* @__PURE__ */ ae(h8, [["render", y8], ["__scopeId", "data-v-d2367b25"]]), b8 = {
   props: {
     modelValue: { type: String, default: "" },
     // 传入的字符串
@@ -20893,16 +20893,16 @@ const Zc = /* @__PURE__ */ ae(bA, [["render", CA], ["__scopeId", "data-v-c34118b
       for (let a = 0; a < r; a++) {
         const o = [];
         e.forEach((i, l) => {
-          var s;
+          var s, u;
           if (a < i.headers.length) {
-            const u = i.headers[a], d = i.metricName, f = i.rows[0].values[a];
+            const d = i.headers[a], f = i.metricName, A = i.rows[0].values[a];
             o.push({
-              name: u != d ? l == 0 ? ((s = t == null ? void 0 : t.title) == null ? void 0 : s.text) || `${u}-${d}` : `${u}-${d}` : d,
+              name: d != f ? l == 0 ? ((s = t == null ? void 0 : t.title) == null ? void 0 : s.text) || `${d}-${f}` : `${d}-${f}` : l == 0 && ((u = t == null ? void 0 : t.title) == null ? void 0 : u.text) || f,
               unit: i.unit,
               unitName: i.unitName,
               unit: i.unit,
               setting: t,
-              value: f
+              value: A
             });
           }
         }), o.length > 0 && n.push(o);
@@ -21014,7 +21014,7 @@ function IA(e, t, n, r, a, o) {
     ], 4))), 128))
   ], 4);
 }
-const Yc = /* @__PURE__ */ ae(vA, [["render", IA], ["__scopeId", "data-v-281ea2fd"]]), xA = {
+const Yc = /* @__PURE__ */ ae(vA, [["render", IA], ["__scopeId", "data-v-13aefa1d"]]), xA = {
   name: "GaugeChart",
   props: {
     rawData: {