lw-cdp-ui 1.2.45 → 1.2.46

package/dist/components/lwFormMini/FormItem.vue

@@ -168,7 +168,7 @@
                       :disabled="item?.options.disabled">
         <el-radio v-for="_item in item?.options.items"
                   :key="_item.value"
-                  :value="_item.value">{{ _item.label }}</el-radio>
+                  :value="_item.value" :label="_item.label">{{ _item.label }}</el-radio>
       </el-radio-group>
     </template>
     <!-- color -->
@@ -191,7 +191,7 @@
       <div class="tags-list">
         <el-tag v-for="tag in objItem.value"
                 :key="tag"
-                closable
+                :closable="!item?.options?.disabled || item?.options?.closable"
                 :disable-transitions="false"
                 @close="tagClose(tag, objItem.value)">
           {{ tag }}
@@ -202,7 +202,7 @@
                   size="small"
                   @keyup.enter="tagInputConfirm(item, objItem.value)"
                   @blur="tagInputConfirm(item, objItem.value)" />
-        <el-button v-else
+        <el-button v-if="!tagVisible[item.name] && !item?.options?.disabled"
                    class="button-new-tag"
                    size="small"
                    @click="tagVisible[item.name] = true">

package/dist/components/lwLayout/components/bu.vue

@@ -51,8 +51,10 @@ export default {
 
       }
 
+      //判断是否当前路由，否的话跳转
       this.$store.commit('clearKeepLive')
-      this.$store.commit('setRouteShow', false)
+      this.$store.commit("setRouteShow", false)
+
     }
   },
   async created() {

package/dist/components/lwTable/index.js

@@ -1,273 +1,283 @@
+import { VueSelecto } from 'vue3-selecto'
 export default {
-  name: 'lwTable',
-  props: {
-    // 表格基础配置
-    refName: { type: String, default: 'multipleTableRef' }, // 表格的 ref 名称
-    tableName: { type: String, default: '' }, // 表格名称
-    tableData: { type: Array, default: () => [] }, // 表格数据
-    tableColumns: { type: Array, default: () => [] }, // 表格列配置
-    loading: { type: Boolean, default: false }, // 加载状态
-    tableSize: { type: String, default: 'large' }, // 表格尺寸
-
-    // 表格样式配置
-    bordered: { type: Boolean, default: true }, // 是否显示边框
-    stripe: { type: Boolean, default: false }, // 是否显示斑马纹
-    hoverable: { type: Boolean, default: true }, // 是否启用鼠标悬停效果
-    maxHeight: { type: String, default: 'calc(100vh - 270px)' }, // 表格最大高度
-
-    // 选择功能配置
-    rowSelection: { type: Boolean, default: false }, // 是否可选择行
-    isRadio: { type: Boolean, default: false }, // 是否为单选模式
-    rowKey: { type: String, default: 'id' }, // 行数据的唯一标识字段
-    defaultSelectData: { type: Array, default: () => [] }, // 默认选中的数据
-    selectedKeys: { type: Array }, // 选中的行 key 值
-    selectDatas: { type: Array }, // 选中的行数据
-    selectStatus: { type: Function, default: () => true }, // 选择状态回调
-
-    // 分页配置
-    isShowPagination: { type: Boolean, default: true }, // 是否显示分页
-    searchParams: { type: Object, default: () => ({ page: 1, size: 20 }) }, // 查询参数
-    totalCount: { type: Number, default: 0 }, // 总数据条数
-    pageSizes: { type: Array, default: () => [10, 20, 30, 40, 50] }, // 分页可选条数
-
-    // 高级功能配置
-    defaultExpandAll: { type: Boolean, default: false }, // 是否默认展开所有行
-    virtualListProps: { type: Object, default: undefined }, // 虚拟滚动配置
-    summaryMethod: { type: Function, default: () => [] }, // 自定义合计方法
-    hideTool: { type: Boolean, default: true }, // 是否隐藏工具栏
-    isSetting: { type: Boolean, default: false }, // 是否显示列设置
-    saveKey: { type: String, default: '' }, // 本地存储 key，用于保存表格配置
-    draggable: { type: Object } // 是否可拖拽列配置
-  },
-
-  data() {
-    return {
-      // 表格基础状态
-      tableHeaders: [], // 表格列配置
-      localTableSize: this.tableSize, // 表格大小
-
-      // 列设置相关
-      checkedKeys: [], // 选中的列
-      treeData: [], // 所有列数据
-      allCheck: true, // 是否全选
-      fixNum: 0, // 固定列数量
-
-      // 选择相关
-      selectedKeysForm: [], // 选中的键
-      selectGoodsDatas: [], // 选中的数据
-      selectAllGoods: [], // 所有可选数据
-
-      // 全屏相关
-      isFullscreen: false
-    }
-  },
-
-  watch: {
-    tableColumns: {
-      handler() {
-        this.filterData()
-      },
-      deep: true,
-      immediate: true
-    },
-
-    tableData: {
-      handler(newVal) {
-        // 合并去重数据
-        const mergedData = [...newVal, ...this.selectAllGoods]
-        const uniqueData = Array.from(new Set(mergedData.map(item => item[this.rowKey])))
-          .map(id => mergedData.find(item => item[this.rowKey] === id))
-        this.selectAllGoods = uniqueData
-      },
-      deep: true,
-      immediate: true
-    },
-
-    selectedKeys: {
-      handler(newVal) {
-        if (!newVal) return
-
-        this.selectedKeysForm = newVal
-        this.selectGoodsDatas = []
-
-        if (this.selectAllGoods.length) {
-          const selectedData = this.selectAllGoods.filter(item => newVal.includes(item[this.rowKey]))
-          const mergedData = [...selectedData, ...this.selectGoodsDatas]
-          const uniqueData = Array.from(new Set(mergedData.map(item => item[this.rowKey])))
-            .map(id => mergedData.find(item => item[this.rowKey] === id))
-
-          this.selectGoodsDatas = uniqueData
-          this.$emit('update:selectDatas', uniqueData)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-
-  created() {
-    // 监听窗口大小变化
-    window.addEventListener('resize', this.handleResize)
-  },
-
-  beforeDestroy() {
-    // 移除事件监听
-    window.removeEventListener('resize', this.handleResize)
-  },
-
-  methods: {
-    /**
-     * 过滤和处理表格列配置
-     */
-    filterData() {
-      const columns = this.tableColumns
-      this.checkedKeys = []
-      const visibleColumns = []
-
-      columns.forEach(column => {
-        if (!column.key) {
-          column.key = this.$tool.getUUID()
-        }
-
-        if (column.checked === undefined || column.checked) {
-          this.checkedKeys.push(column.key)
-          visibleColumns.push(column)
-        }
-      })
-
-      this.treeData = columns
-      this.tableHeaders = visibleColumns
-    },
-
-    /**
-     * 全选/取消全选所有列
-     */
-    checkAll(selected) {
-      if (selected) {
-        this.tableHeaders = JSON.parse(JSON.stringify(this.tableColumns))
-        this.checkedKeys = this.tableHeaders.map(col => {
-          if (!col.key) {
-            col.key = this.$tool.getUUID()
-          }
-          return col.key
-        })
-      } else {
-        this.tableHeaders = []
-        this.checkedKeys = []
-      }
-
-      this.treeData.forEach(col => {
-        col.checked = selected
-      })
-    },
-
-    /**
-     * 更新列的选中状态
-     */
-    treeCheck() {
-      this.tableHeaders = this.treeData.filter(col =>
-        this.checkedKeys.includes(col.key)
-      )
-    },
-
-    /**
-     * 处理行变化
-     */
-    handleChange(currentData) {
-      this.$emit('draggable', currentData)
-    },
-
-    /**
-     * 处理选择变化
-     */
-    handleSelectionChange(val) {
-      this.$emit('multipleSelection', val)
-    },
-
-    /**
-     * 处理当前行变化
-     */
-    handleCurrentChange(val) {
-      this.$emit('currentChange', val)
-    },
-
-    /**
-     * 处理每页条数变化
-     */
-    sizeChange(val) {
-      this.searchParams.size = val
-      this.$emit('getTableData')
-    },
-
-    /**
-     * 处理页码变化
-     */
-    currentChange(page) {
-      this.searchParams.page = page - 1
-      this.$emit('getTableData', this.searchParams.page)
-    },
-
-    /**
-     * 刷新表格数据
-     */
-    refresh() {
-      this.currentChange(1)
-    },
-
-    /**
-     * 处理表格大小变化
-     */
-    handleSelect(v) {
-      this.localTableSize = v
-    },
-
-    /**
-     * 切换全屏显示
-     */
-    tableToggleFullScreen() {
-      this.$bus.$emit('tableFullScreen', !this.isFullscreen)
-      this.isFullscreen = !this.isFullscreen
-      // 这里需要实现具体的全屏切换逻辑
-    },
-
-    /**
-     * 处理窗口大小变化
-     */
-    handleResize() {
-      const isFull = document.fullscreenElement ||
-        document.mozFullScreenElement ||
-        document.webkitFullscreenElement ||
-        document.msFullscreenElement
-
-      if (!isFull) {
-        this.$bus.$emit('tableFullScreen', false)
-        this.isFullscreen = false
-      }
-    },
-
-    /**
-     * 过滤列表操作按钮
-     */
-    filterOperations(operations, row) {
-      return operations?.filter(o => {
-        const hasAuth = !o.auth || this.checkAuth(o.auth)
-        const isVisible = !o.isShow || o.isShow(row)
-        return hasAuth && isVisible
-      }) || []
-    },
-
-    /**
-     * 检查权限
-     */
-    checkAuth(auth) {
-      const { menus = [], authorities = [] } = JSON.parse(localStorage.getItem('userAuthInfo') || '{}')
-      const allPermissions = [...menus, ...authorities]
-
-      if (!auth) return true
-      if (Array.isArray(auth)) {
-        return auth.some(permission => allPermissions.includes(permission))
-      }
-      return allPermissions.includes(auth)
-    }
-  }
-}
+	name: 'lwTable',
+	components: { VueSelecto },
+	props: {
+		// 表格基础配置
+		refName: { type: String, default: 'multipleTableRef' }, // 表格的 ref 名称
+		tableName: { type: String, default: '' }, // 表格名称
+		tableData: { type: Array, default: () => [] }, // 表格数据
+		tableColumns: { type: Array, default: () => [] }, // 表格列配置
+		loading: { type: Boolean, default: false }, // 加载状态
+		tableSize: { type: String, default: 'large' }, // 表格尺寸
+
+		// 表格样式配置
+		bordered: { type: Boolean, default: true }, // 是否显示边框
+		stripe: { type: Boolean, default: false }, // 是否显示斑马纹
+		hoverable: { type: Boolean, default: true }, // 是否启用鼠标悬停效果
+		maxHeight: { type: String, default: 'calc(100vh - 270px)' }, // 表格最大高度
+
+		// 选择功能配置
+		rowSelection: { type: Boolean, default: false }, // 是否可选择行
+		isRadio: { type: Boolean, default: false }, // 是否为单选模式
+		rowKey: { type: String, default: 'id' }, // 行数据的唯一标识字段
+		defaultSelectData: { type: Array, default: () => [] }, // 默认选中的数据
+		selectedKeys: { type: Array }, // 选中的行 key 值
+		selectDatas: { type: Array }, // 选中的行数据
+		selectStatus: { type: Function, default: () => true }, // 选择状态回调
+
+		// 分页配置
+		isShowPagination: { type: Boolean, default: true }, // 是否显示分页
+		searchParams: { type: Object, default: () => ({ page: 1, size: 20 }) }, // 查询参数
+		totalCount: { type: Number, default: 0 }, // 总数据条数
+		pageSizes: { type: Array, default: () => [10, 20, 30, 40, 50] }, // 分页可选条数
+
+		// 高级功能配置
+		defaultExpandAll: { type: Boolean, default: false }, // 是否默认展开所有行
+		virtualListProps: { type: Object, default: undefined }, // 虚拟滚动配置
+		summaryMethod: { type: Function, default: () => [] }, // 自定义合计方法
+		hideTool: { type: Boolean, default: true }, // 是否隐藏工具栏
+		hideCard: { type: Boolean, default: true }, // 是否显示卡片
+		isSetting: { type: Boolean, default: false }, // 是否显示列设置
+		saveKey: { type: String, default: '' }, // 本地存储 key，用于保存表格配置
+		draggable: { type: Object } // 是否可拖拽列配置
+	},
+
+	data() {
+		return {
+			// 表格基础状态
+			tableHeaders: [], // 表格列配置
+			localTableSize: this.tableSize, // 表格大小
+
+			// 列设置相关
+			checkedKeys: [], // 选中的列
+			treeData: [], // 所有列数据
+			allCheck: true, // 是否全选
+			fixNum: 0, // 固定列数量
+
+			// 选择相关
+			selectedKeysForm: [], // 选中的键
+			selectGoodsDatas: [], // 选中的数据
+			selectAllGoods: [], // 所有可选数据
+
+			// 全屏相关
+			isFullscreen: false,
+			isCard: !this.hideCard // 是否显示卡片
+		}
+	},
+
+	watch: {
+		tableColumns: {
+			handler() {
+				this.filterData()
+			},
+			deep: true,
+			immediate: true
+		},
+
+		tableData: {
+			handler(newVal) {
+				// 合并去重数据
+				const mergedData = [...newVal, ...this.selectAllGoods]
+				const uniqueData = Array.from(new Set(mergedData.map((item) => item[this.rowKey]))).map((id) => mergedData.find((item) => item[this.rowKey] === id))
+				this.selectAllGoods = uniqueData
+			},
+			deep: true,
+			immediate: true
+		},
+
+		selectedKeys: {
+			handler(newVal) {
+				if (!newVal) return
+
+				this.selectedKeysForm = newVal
+				this.selectGoodsDatas = []
+
+				if (this.selectAllGoods.length) {
+					const selectedData = this.selectAllGoods.filter((item) => newVal.includes(item[this.rowKey]))
+					const mergedData = [...selectedData, ...this.selectGoodsDatas]
+					const uniqueData = Array.from(new Set(mergedData.map((item) => item[this.rowKey]))).map((id) => mergedData.find((item) => item[this.rowKey] === id))
+
+					this.selectGoodsDatas = uniqueData
+					this.$emit('update:selectDatas', uniqueData)
+				}
+			},
+			deep: true,
+			immediate: true
+		}
+	},
+
+	created() {
+		// 监听窗口大小变化
+		window.addEventListener('resize', this.handleResize)
+	},
+
+	beforeDestroy() {
+		// 移除事件监听
+		window.removeEventListener('resize', this.handleResize)
+	},
+
+	methods: {
+		/**
+		 * 过滤和处理表格列配置
+		 */
+		filterData() {
+			const columns = this.tableColumns
+			this.checkedKeys = []
+			const visibleColumns = []
+
+			columns.forEach((column) => {
+				if (!column.key) {
+					column.key = this.$tool.getUUID()
+				}
+
+				if (column.checked === undefined || column.checked) {
+					this.checkedKeys.push(column.key)
+					visibleColumns.push(column)
+				}
+			})
+
+			this.treeData = columns
+			this.tableHeaders = visibleColumns
+		},
+
+		/**
+		 * 全选/取消全选所有列
+		 */
+		checkAll(selected) {
+			if (selected) {
+				this.tableHeaders = JSON.parse(JSON.stringify(this.tableColumns))
+				this.checkedKeys = this.tableHeaders.map((col) => {
+					if (!col.key) {
+						col.key = this.$tool.getUUID()
+					}
+					return col.key
+				})
+			} else {
+				this.tableHeaders = []
+				this.checkedKeys = []
+			}
+
+			this.treeData.forEach((col) => {
+				col.checked = selected
+			})
+		},
+
+		/**
+		 * 更新列的选中状态
+		 */
+		treeCheck() {
+			this.tableHeaders = this.treeData.filter((col) => this.checkedKeys.includes(col.key))
+		},
+
+		/**
+		 * 处理行变化
+		 */
+		handleChange(currentData) {
+			this.$emit('draggable', currentData)
+		},
+
+		/**
+		 * 处理选择变化
+		 */
+		handleSelectionChange(val) {
+			this.$emit('multipleSelection', val)
+		},
+
+		/**
+		 * 处理当前行变化
+		 */
+		handleCurrentChange(val) {
+			this.$emit('currentChange', val)
+		},
+
+		/**
+		 * 处理每页条数变化
+		 */
+		sizeChange(val) {
+			this.searchParams.size = val
+			this.$emit('getTableData')
+		},
+
+		/**
+		 * 处理页码变化
+		 */
+		currentChange(page) {
+			this.searchParams.page = page - 1
+			this.$emit('getTableData', this.searchParams.page)
+		},
+
+		/**
+		 * 刷新表格数据
+		 */
+		refresh() {
+			this.currentChange(1)
+		},
+
+		/**
+		 * 处理表格大小变化
+		 */
+		handleSelect(v) {
+			this.localTableSize = v
+		},
+
+		/**
+		 * 切换全屏显示
+		 */
+		tableToggleFullScreen() {
+			this.$bus.$emit('tableFullScreen', !this.isFullscreen)
+			this.isFullscreen = !this.isFullscreen
+			// 这里需要实现具体的全屏切换逻辑
+		},
+
+		/**
+		 * 处理窗口大小变化
+		 */
+		handleResize() {
+			const isFull = document.fullscreenElement || document.mozFullScreenElement || document.webkitFullscreenElement || document.msFullscreenElement
+
+			if (!isFull) {
+				this.$bus.$emit('tableFullScreen', false)
+				this.isFullscreen = false
+			}
+		},
+
+		/**
+		 * 过滤列表操作按钮
+		 */
+		filterOperations(operations, row) {
+			return (
+				operations?.filter((o) => {
+					const hasAuth = !o.auth || this.checkAuth(o.auth)
+					const isVisible = !o.isShow || o.isShow(row)
+					return hasAuth && isVisible
+				}) || []
+			)
+		},
+
+		/**
+		 * 检查权限
+		 */
+		checkAuth(auth) {
+			const { menus = [], authorities = [] } = JSON.parse(localStorage.getItem('userAuthInfo') || '{}')
+			const allPermissions = [...menus, ...authorities]
+
+			if (!auth) return true
+			if (Array.isArray(auth)) {
+				return auth.some((permission) => allPermissions.includes(permission))
+			}
+			return allPermissions.includes(auth)
+		},
+		// 拖动选中
+		onSelect({ selected }) {
+			let list = []
+			selected.forEach((node) => {
+				// 获取 data-item 属性的值
+				const item = node.getAttribute('data-item')
+				const itemData = JSON.parse(item)
+				list.push(itemData)
+			})
+			this.$emit('multipleSelection', list)
+		}
+	}
+}

package/dist/components/lwTable/index.scss

@@ -1,6 +1,6 @@
 .baseTablePage-wrap {
 	position: relative;
-
+	user-select: none;
 	.icon-more {
 		margin-top: 3px;
 		cursor: pointer;