lw-cdp-ui 1.2.58 → 1.2.61

package/dist/components/lwFormMini/ViewItem.vue

@@ -71,7 +71,7 @@
     <!-- checkboxGroup 、select、radio -->
     <template
               v-else-if="item.component == 'checkboxGroup' || item.component == 'select' || item.component == 'radio'">
-      {{ getKeyToLabel(objItem.value, item?.options.items) }}
+      {{ getKeyToLabel(objItem.value, item?.options) }}
     </template>
 
     <!-- switch -->
@@ -285,9 +285,12 @@ export default {
       return item.rules;
     },
     // key to label
-    getKeyToLabel(val, items = []) {
-      let item = items.find(item => { return item.value == val })
-      return item?.label || val || '--'
+    getKeyToLabel(val, options = {}) {
+      if (!options?.multiple) {
+        val = [val]
+      }
+      let items = options.items.filter(item => { return val.includes(item.value)  })
+      return items?.map(item => item.label).join('、') || val || '--'
     },
     dayjs: dayjs
   }

package/dist/components/lwLayout/components/task.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="task-item">
+    <div class="task-btn"
+         @click="openTask">
+      <el-icon><el-icon-finished /></el-icon>
+      任务中心
+    </div>
+
+  </div>
+  <el-drawer v-model="drawer"
+             title="任务中心"
+             size="61.8%">
+    <div class="task-content">
+      <lw-search :options="searchOptions"
+                 v-model="searchParams"
+                 :columnNumber="layout.grid"
+                 :expandNumber="4"
+                 :labelWidth="layout.labelWidth + 'px'"
+                 :hideLabel="layout.hideLabel"
+                 :labelAlign="layout.labelAlign"
+                 @search="search"
+                 @reset="reset" />
+      <div class="table-block">
+        <lw-table :hideTool="false"
+                  :loading="loading"
+                  :table-data="tableData"
+                  :tableColumns="tableHeaders"
+                  :search-params="searchParams"
+                  :isShowPagination="true"
+                  :total-count="totalCount"
+                  @getTableData="getTableData" />
+      </div>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import lwTable from '../../lwTable/index.vue'
+import lwSearch from '../../lwSearch/index.vue'
+
+
+export default {
+  components: {
+    lwTable,
+    lwSearch
+  },
+  data() {
+    return {
+      drawer: false,
+      searchOptions: [
+        {
+          label: '类型',
+          prop: 'type_like',
+          renderType: 'select',
+          options: [
+            { value: 'Manual', label: '手动执行' },
+            { value: 'Timer', label: '定时执行' },
+            { value: 'Cycle', label: '周期执行' }
+          ],
+          valueKey: 'value',
+          labelKey: 'label'
+        },
+        { label: '类型', prop: 'type_like', renderType: 'se' },
+        { label: '状态', prop: 'status_like', renderType: 'input' }
+      ],
+      searchParams: {
+        page: 1,
+        size: 10
+      },
+      layout: { grid: 4, labelWidth: '0', hideLabel: true, labelAlign: 'right' },
+      tableData: [],
+      totalCount: 0,
+      tableHeaders: [
+        { title: '名称', dataIndex: 'name', minWidth: '120', copy: true, tooltip: true },
+        { title: '类型', dataIndex: 'type', minWidth: '120', copy: true, tooltip: true },
+        {
+          title: '开启时间',
+          dataIndex: 'startTime',
+          width: '180',
+          eleRender: (scope) => `<span>${dayjs(scope.startTime).format('YYYY-MM-DD HH:mm:ss')}</span>`
+        },
+        {
+          title: '结束时间',
+          dataIndex: 'executeMode.expireTime',
+          width: '180',
+          eleRender: (scope) => `<span>${dayjs(scope.executeMode?.expireTime).format('YYYY-MM-DD HH:mm:ss')}</span>`
+        },
+        {
+          title: '执行模式', dataIndex: 'executeMode.type', minWidth: '120',
+          eleRender: (scope) => {
+            let typeList = {
+              Manual: '手动执行',
+              Timer: '定时执行',
+              Cycle: '周期执行'
+            }
+            return typeList[scope.executeMode.type]
+          }
+        },
+        {
+          title: this.$t('btn.operation'),
+          width: '140',
+          fixed: 'right',
+          ellipsis: true,
+          operation: [
+            {
+              icon: '',
+              clickFun: this.del,
+              label: this.$t('btn.delete'),
+              isShow: () => true
+            }
+          ]
+        }
+      ],
+      visible: false,
+      loading: false
+    }
+  },
+  methods: {
+    async getTableData(page = 0) {
+      this.loading = true
+      let params = {
+        page: page,
+        size: this.searchParams.size,
+        expression: this.$expression(this.searchParams)
+      }
+      this.searchParams.page = page + 1
+
+      let code = `${this.$tool.data.get('tenantId')}_${this.$tool.data.get('tenantId')}_${this.$config.APP_NAME.toLowerCase()}`
+      let url = `${this.$config.API_URL}/job-manage/${code}/job`
+
+      await this.$http.get(url, params)
+      this.tableData = res.content
+      this.currentPage = page
+      this.totalCount = res.size
+      this.loading = false
+    },
+    reset() {
+      this.searchParams = {}
+      this.getTableData()
+    },
+    search() {
+      this.getTableData()
+    },
+    openTask() {
+      this.getTableData()
+      this.drawer = true
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.task-item {
+  height: 100%;
+  .task-btn {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+    height: 100%;
+    white-space: nowrap;
+    color: var(--el-text-color-regular);
+    padding: 0 10px;
+    cursor: pointer;
+    &:hover {
+      background: rgba(0, 0, 0, 0.1);
+    }
+  }
+}
+.task-content {
+  padding: 20px;
+}
+</style>

package/dist/components/lwLayout/components/userbar.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="user-bar">
     <slot name="userbarActionBox"></slot>
+    <!-- 任务中心 -->
+    <task v-if="isShowTask" />
+
+    <!-- 下拉BU -->
     <bu v-if="isShowBu"
         :isInitialized="isInitialized" />
 
@@ -38,6 +42,7 @@
 
 <script>
 import bu from './bu.vue'
+import task from './task.vue'
 import empty from '@/assets/images/empty.jpg'
 export default {
   props: {
@@ -45,13 +50,18 @@ export default {
       type: Boolean,
       default: true
     },
+    isShowTask: {
+      type: Boolean,
+      default: true
+    },
     isInitialized: {
       type: Boolean,
       default: true
     },
   },
   components: {
-    bu
+    bu,
+    task
   },
   data() {
     return {

package/dist/components/lwLayout/index.vue

@@ -23,6 +23,7 @@
       </div>
       <div class="adminui-header-right">
         <userbar :isShowBu="isShowBu"
+                 :isShowTask="isShowTask"
                  :isInitialized="isInitialized">
           <template #userbarActionBox>
             <slot name="userbarActionBox"></slot>
@@ -112,6 +113,7 @@
               <Topbar v-if="!ismobile"></Topbar>
             </div>
             <userbar :isShowBu="isShowBu"
+                     :isShowTask="isShowTask"
                      :isInitialized="isInitialized">
               <template #userbarActionBox>
                 <slot name="userbarActionBox"></slot>
@@ -163,6 +165,7 @@
         </div>
         <Side-m v-if="ismobile"></Side-m>
         <userbar :isShowBu="isShowBu"
+                 :isShowTask="isShowTask"
                  :isInitialized="isInitialized">
           <template #userbarActionBox>
             <slot name="userbarActionBox"></slot>
@@ -242,6 +245,7 @@
       <div class="aminui-body el-container">
         <Topbar>
           <userbar :isShowBu="isShowBu"
+                   :isShowTask="isShowTask"
                    :isInitialized="isInitialized">
             <template #userbarActionBox>
               <slot name="userbarActionBox"></slot>
@@ -298,6 +302,10 @@ export default {
       type: Boolean,
       default: true
     },
+    isShowTask: {
+      type: Boolean,
+      default: false
+    },
     // 是否要校验初始化
     isInitialized: {
       type: Boolean,

package/dist/components/lwLayout/locale/en-us.js

@@ -0,0 +1,20 @@
+export default {
+	user: {
+		settings: 'Settings',
+		nightmode: 'Night Mode',
+		color: 'Theme Color',
+		layout: 'Layout',
+		menu: 'Collapse Menu',
+		tag: 'Tag Bar',
+		lang: 'Internationalization',
+		nightmode_msg: 'Suitable for low-light environments; the current dark mode is in beta.',
+		language: 'Language',
+		language_msg: 'Translation in progress; only the text of this view has been translated.'
+	},
+	layout: {
+		topbar: 'Location',
+		userData: 'User Center',
+		outLogin: 'Logout',
+		clearCache: 'Clear Cache'
+	}
+}

package/dist/components/lwLayout/locale/zh-cn.js

@@ -0,0 +1,20 @@
+export default {
+	user: {
+		settings: '设置',
+		nightmode: '黑夜模式',
+		color: '主题颜色',
+		layout: '框架布局',
+		menu: '折叠菜单',
+		tag: '标签栏',
+		lang: '国际化',
+		nightmode_msg: '适合光线较弱的环境，当前黑暗模式为beta版本',
+		language: '语言',
+		language_msg: '翻译进行中，暂翻译了本视图的文本'
+	},
+	layout: {
+		topbar: '所在位置',
+		userData: '个人中心',
+		outLogin: '退出登录',
+		clearCache: '清除缓存'
+	}
+}

package/dist/components/lwLogin/index.vue

@@ -342,6 +342,10 @@ export default {
       this.islogin = true;
       // 获取所有bu
       let bu = await this.$api.auth.bu()
+      if (bu.length == 0) {
+        this.$message.warning('用户没有应用权限');
+        return false
+      }
       this.$tool.data.set('buList', bu)
       let code = this.$tool.data.get('buCode')
       let item = bu.find(x => { return x.code == code })

package/dist/components/lwSvgIcon/index.vue

@@ -6,7 +6,7 @@
 
 <!-- lwSvgIcon组件，可将svg图标直接当组件使用 -->
 <script setup>
-import { defineProps, computed } from 'vue'
+import { computed } from 'vue'
 const props = defineProps({
   name: {
     type: String,

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

@@ -13,6 +13,30 @@
                  :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"
+                   :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>
+        </slot>
+      </template>
+    </template>
+  </el-table-column>
+
   <el-table-column v-else
                    :prop="col.dataIndex"
                    :label="col.title"
@@ -138,6 +162,17 @@
                     :preview-teleported="true" />
         </template>
 
+        <!-- switch -->
+        <template v-else-if="col.switch">
+          <el-switch v-model="scope.row[col.dataIndex]"
+                     inline-prompt
+                     :active-text="col?.activeText || '是'"
+                     :inactive-text="col?.inactiveText || '否'"
+                     :active-value="col?.activeValue || true"
+                     :inactive-value="col?.inactiveValue || false"
+                     @click="col.callback(scope.row[col.dataIndex], scope.row)"></el-switch>
+        </template>
+
         <!-- 选项列 -->
         <template v-else-if="!col.switch && col.options?.length">
           <template v-if="scope.row.isEdit && col.canEdit">

package/dist/components/lwTableForm/index.vue

@@ -101,13 +101,15 @@
         <!-- select -->
         <template v-else-if="item.component=='select'">
           <el-select v-model="row[item.name]"
-                     :multiple="item.options?.multiple"
-                     :allow-create="item.options?.allowCreate"
+                     :multiple="item?.options?.multiple"
+                     :allow-create="item?.options?.allowCreate"
                      default-first-option
-                     :placeholder="item.options?.placeholder || ''"
-                     :clearable="item.options?.clearable"
-                     :disabled="isDisabled(item, row)"
+                     :placeholder="item?.options?.placeholder || ''"
+                     :clearable="item?.options?.clearable"
+                     :collapse-tags="item?.options?.collapseTags"
+                     :collapse-tags-tooltip="item?.options?.collapseTagsTooltip"
                      filterable
+                     :disabled="isDisabled(item, row)"
                      :size="config.size || 'small'"
                      style="width: 100%;">
             <el-option v-for="option in item.options.items"
@@ -295,7 +297,7 @@
                    layout="prev, pager, next"
                    :total="tableData.length" />
   </div>
-  <div v-if="!isView"
+  <div v-if="!isView && showAddBtn"
        class="btn-list">
     <el-button type="primary"
                class="add-btn"
@@ -320,6 +322,8 @@ export default {
     isView: { type: Boolean, default: false },
     //  是否分页
     isPagination: { type: Boolean, default: false },
+    //  是否显示添加
+    showAddBtn: { type: Boolean, default: true },
   },
   data() {
     return {
@@ -537,8 +541,8 @@ export default {
           return
         }
         // 如果有子节点，则递归调用
-        if (data[i][this.config.treeProps.children]) {
-          this.removeNode(data[i][this.config.treeProps.children], item)
+        if (data[i][this.config.treeProps?.children]) {
+          this.removeNode(data[i][this.config.treeProps?.children], item)
         }
       }
     },

package/dist/components/lwTableSelect/index.vue

@@ -74,6 +74,7 @@ export default {
     disabled: { type: Boolean, default: false },
     tableWidth: { type: Number, default: 400 },
     mode: { type: String, default: "popover" },
+    valueKey: { type: String, default: "" },
     // 定义什么参数就返回什么  value label 为 必须字段
     props: { type: Object, default: () => { } }
   },
@@ -262,35 +263,38 @@ export default {
       setTimeout(() => {
         this.isLock = false
       }, 1000)
-      this.$emit('update:modelValue', this.defaultValue);
-      this.$emit('change', this.defaultValue);
+      this.$emit('update:modelValue', { ...this.modelValue, ...this.defaultValue });
+      this.$emit('change', { ...this.modelValue, ...this.defaultValue });
     },
     // 初始化回显
     initValue(val = this.modelValue) {
-      if (val && !this.isLock) {
-        this.defaultProps = Object.assign(this.defaultProps, this.props);
-        // 自动判断类型回显
-        let list = []
-        if (typeof val === 'string') {
-          list.push(val)
-        } else if (Array.isArray(val)) {
-          val.forEach(item => {
-            console.log(item)
-            if (typeof item === 'string' && item) {
-              list.push(item)
-            } else if (typeof item === 'object' && item) {
-              list.push(item[this.defaultProps.value])
-            }
-          })
-        } else if (typeof val === 'object') {
-          list.push(val[this.defaultProps.value])
-        }
+      if (!val || this.isLock) return; // 直接返回，避免执行无意义的逻辑
 
-        this.listIds = list
-        this.idExpression = this.$expression({ [`${this.defaultProps.value}_in`]: list })
+      this.defaultProps = { ...this.defaultProps, ...this.props }; // 使用展开运算符简化 Object.assign
 
-        this.getData(10000)
+      let list = [];
+
+      if (typeof val === 'string' && val.trim()) {
+        list.push(val);
+      } else if (Array.isArray(val)) {
+        list = val
+          .map(item => {
+            if (typeof item === 'string' && item.trim()) return item;
+            if (typeof item === 'object' && item) return item[this.valueKey || this.defaultProps.value];
+            return null;
+          })
+          .filter(Boolean); // 过滤掉 null、undefined、空字符串
+      } else if (typeof val === 'object' && val) {
+        const value = val[this.valueKey || this.defaultProps.value];
+        if (value) list.push(value);
       }
+
+      if (!list.length) return; // 如果最终 list 为空，则不进行后续操作
+
+      this.listIds = list;
+      this.idExpression = this.$expression({ [`${this.defaultProps.value}_in`]: list });
+
+      this.getData(10000);
     },
     // 关键值查询表格数据行
     findRowByKey(value) {