w-ui-v1 1.1.21 → 1.1.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/w-menu/w-menu.vue

@@ -228,8 +228,8 @@ function queryList() {
 	  color: #4D81F1;
 	  width: 55px;
 	  overflow: hidden;
-	  text-overflow: ellipsis;
-	  white-space: nowrap;
+	  // text-overflow: ellipsis;
+	  white-space: pre-wrap;
 	  // white-space: pre-wrap;
 	  // text-align: left;
   }
@@ -253,4 +253,10 @@ function queryList() {
   // background-color: #F6F7FB;
   background: linear-gradient(to top, #F6F7FB 0%, #2c5def 100%);
 }
+
+:deep(.wd-grid){
+	float: unset;
+	display: flex;
+	flex-wrap: wrap;
+}
 </style>

package/w-report-table/w-report-table.vue

@@ -3,6 +3,10 @@
 		<!-- 搜索 -->
 		<wSearch :primaryCriteria="pageConfigs.primaryCriteria" :criterias="pageConfigs.drillingParams" @search="search" v-if="pageConfigs.buttons?.includes('query')">
 		</wSearch>
+		<view v-if="loading" class="enpert">
+			<wd-loading />
+		</view>
+		
 		<!-- 横向滚动容器 -->
 		<scroll-view scroll-x class="table-scroll-x">
 			<!-- 表格头部 -->
@@ -21,7 +25,11 @@
 			</view>
 
 			<!-- 表格内容 -->
-			<scroll-view scroll-y class="table-body" :style="{maxHeight: bodyHeight + 'rpx'}">
+			<view v-if="cdata.length===0" class="enpert">
+				暂无数据~
+			</view>
+			<scroll-view v-else  scroll-y class="table-body" :style="{maxHeight: bodyHeight + 'rpx'}">
+				
 				<view class="table-row" :style="{backgroundColor:(row.dataType==='小计'?'#B9E0FF':row.dataType==='合计'?'#69B0FE':null),fontWeight:row.dataType==='小计'||row.dataType==='合计'?'700':null }" v-for="(row, rowIndex) in cdata" :key="rowIndex"
 					:class="{ 'zebra-stripe': rowIndex % 2 === 0 }">
 					<view  class="body-cell" v-for="(col, colIndex) in ccolumns" :key="colIndex"
@@ -108,10 +116,10 @@
 	    required: false,
 	    default: 0
 	  },
-	  loading: {
-	    type: Boolean,
-	    default: false
-	  },
+	  // loading: {
+	  //   type: Boolean,
+	  //   default: false
+	  // },
 	  pagination: {
 	    type: Boolean,
 	    default: false
@@ -119,9 +127,9 @@
 	})
 	
 	const emit = defineEmits(['page-change', 'sort-change'])
-	
+	const loading=ref(false)
 	const currentPage = ref(1)
-	const bodyHeight = ref(1154)
+	const bodyHeight = ref(1000)
 	const sortField = ref('')
 	const sortOrder = ref('asc')
 	const pageData = ref({})
@@ -179,11 +187,13 @@
 	}
 	
 	async function getPageData() {
+		loading.value=true
 	  const kres = await getPageKey(sourceId.value, null, query.value)
 	  reportPageData(kres.data?.key).then((res) => {
 	    pageData.value = res.data
 	    data.value = res.data.entities
 	    columns.value = res.data.columnConfigs
+		loading.value=false
 	  })
 	}
 	
@@ -258,6 +268,14 @@
 		width: 100%;
 		overflow-x: auto;
 	}
+	
+	.enpert{
+		
+		padding: 12px;
+		text-align: center;
+		font-size: 16px;
+		font-weight: 700;
+	}
 
 	.table-body {
 		width: max-content;