w-ui-v1 1.1.19 → 1.1.21

package/w-detail/w-detail.vue

@@ -270,6 +270,7 @@ function goto(type = '', PItem: any, item: any) {
 	}
 
 	.value {
+		font-weight: 600;
 		//文字换行
 		white-space: normal;
 		word-break: break-all;
@@ -277,6 +278,7 @@ function goto(type = '', PItem: any, item: any) {
 	}
 
 	.link {
+		// font-weight: 600;
 		color: #4d80f0;
 	}
 }

package/w-form-control/w-form-control.vue

@@ -60,6 +60,12 @@
 		  :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
 		  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
 		  @clear="clear" />
+		  
+		  <wd-calendar v-else-if="subItem.extControlType === 'daterange'" :disabled="subItem.disabled" :label="subItem.title"
+		    label-width="100px" :display-format="displayFormat2" :prop="subItem.id" clearable :modelValue="modelValue" type="daterange"
+		    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+		    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
+		    @clear="clear" />
 
     <wd-cell v-else-if="(subItem.controlType === 'textarea'&&subItem.extControlType==='relselectvalue')||subItem.extControlType === 'entity-select'" title-width="100px" :prop="subItem.id"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
@@ -204,6 +210,17 @@ const modelValue = computed(() => {
 		}):[]
 	}
 	
+	if(props.subItem.extControlType === 'datetime'){
+		return props.model[props.subItem.id]?dayjs(props.model[props.subItem.id]).valueOf():null
+	}
+	
+	if(props.subItem.extControlType==='daterange'){
+		
+		return props.model[props.subItem.id]?props.model[props.subItem.id].split("~").map((item:any)=>{
+			return dayjs(item).valueOf()
+		}):[]
+	}
+	
 	if(props.subItem.extControlType === 'relselect'){
 		if(props.model[props.subItem.id]){
 			let dataArr1=props.model[props.subItem.id].split('@,@')
@@ -221,9 +238,7 @@ const modelValue = computed(() => {
 		return props.model[props.subItem.id]?[JSON.parse(props.model[props.subItem.id])['base']]:[]
 	}
 	
-	if(props.subItem.extControlType === 'datetime'){
-		return props.model[props.subItem.id]?dayjs(props.model[props.subItem.id]).valueOf():null
-	}
+	
 	
 	
 	return props.model[props.subItem.id] || null
@@ -291,6 +306,15 @@ const change = (e:any) => {
 		return
 	}
 	
+	if(props.subItem.extControlType==='daterange'){
+		
+		let data=e.value.map((item:any)=>{
+			return   dayjs(item).format('YYYY-MM-DD')
+		})
+		emit('update:modelValue', data.join('~'))
+		return
+	}
+	
 	if(props.subItem.controlType==='datetime'||props.subItem.extControlType==='datetime'){
 		
 		let data=dayjs(e.value).format('YYYY-MM-DD HH:mm:ss')
@@ -298,6 +322,7 @@ const change = (e:any) => {
 		return
 	}
 	
+	
 	 emit('update:modelValue', e.value)
 	
   // switch (props.subItem.controlType) {
@@ -317,4 +342,8 @@ const clear = () => {
 }
 </script>
 
-<style scoped></style>
+<style scoped>
+	:deep(.wd-cell__wrapper){
+		align-items: center !important; 
+	}
+</style>

package/w-menu/w-menu.vue

@@ -66,17 +66,18 @@ console.log(item.pageType)
 	}
       
       return true
-      break;
+      
     case "报表":
       uni.navigateTo({
         url: `/pages/report-table/report-table?sourceId=${item.id}&pageTitle=${item.title}`,
       })
       return true
-      break;
+     
 
     default:
+	  
       return false
-      break;
+      
   }
 }
 

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

@@ -1,10 +1,13 @@
 <template>
 	<view class="smart-table-container">
+		<!-- 搜索 -->
+		<wSearch :primaryCriteria="pageConfigs.primaryCriteria" :criterias="pageConfigs.drillingParams" @search="search" v-if="pageConfigs.buttons?.includes('query')">
+		</wSearch>
 		<!-- 横向滚动容器 -->
 		<scroll-view scroll-x class="table-scroll-x">
 			<!-- 表格头部 -->
 			<view class="table-header">
-				<view class="header-cell" v-for="(col, index) in columns" :key="index"
+				<view class="header-cell" v-for="(col, index) in ccolumns" :key="index"
 					:style="{ width: col.width || '200px' }">
 					<view @click="sortColumn(col)" style="display: flex; align-items: center;">
 						{{ col.title }}
@@ -18,19 +21,21 @@
 			</view>
 
 			<!-- 表格内容 -->
-			<scroll-view scroll-y class="table-body" :style="{height: bodyHeight + 'px'}">
-				<view class="table-row" v-for="(row, rowIndex) in data" :key="rowIndex"
+			<scroll-view 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 columns" :key="colIndex"
-						:style="{ width: col.width || 'auto' }">
-						{{ row[col.key] }}
+					<view  class="body-cell" v-for="(col, colIndex) in ccolumns" :key="colIndex"
+						:style="{ width: col.width || 'auto'}">
+						
+						<text v-if="(row[col.key]==='小计'||row[col.key]==='合计')&&(colIndex>0)"></text>
+						<text v-else>{{ row[col.key] }}</text>
 					</view>
 				</view>
 			</scroll-view>
 
 			<!-- 合计行 -->
 			<view class="summary-row" v-if="showSummary">
-				<view class="summary-cell" v-for="col in columns" :key="col.key"
+				<view class="summary-cell" v-for="col in ccolumns" :key="col.key"
 					:style="{ width: col.width || 'auto' }">
 					<text v-if="col.summary">{{ getSummary(col) }}</text>
 					<text v-else-if="col.key === columns[0].key">合计</text>
@@ -40,7 +45,7 @@
 		</scroll-view>
 
 		<!-- 分页控件 -->
-		<view class="pagination">
+		<view class="pagination" v-if="pagination">
 			<view class="page-btn" :class="{ disabled: currentPage === 1 }" @click="prevPage">
 				上一页
 			</view>
@@ -54,127 +59,180 @@
 	</view>
 </template>
 
-<script>
-	import {
-		getPageData,
-		getPageKey,
-		pageConfig,
-		getEnum
-	} from '../utils/apis/pageConfig'
-	export default {
-		name: 'WReportTable',
-		props: {
-			sourceId: {
-				type: String,
-				default: ''
-			},
-			mainCode: {
-				type: String,
-				default: ''
-			},
-			showSummary: {
-				type: Boolean,
-				default: false
-			},
-			sortable: {
-				type: Boolean,
-				default: false
-			},
-			columns: {
-				type: Array,
-				required: true
-			},
-			data: {
-				type: Array,
-				required: true
-			},
-			pageSize: {
-				type: Number,
-				default: 10
-			},
-			total: {
-				type: Number,
-				required: false,
-				default: 0
-			},
-			loading: {
-				type: Boolean,
-				default: false
-			}
-		},
-		data() {
-			return {
-				currentPage: 1,
-				bodyHeight: 300,
-				sortField: '',
-				sortOrder: 'asc',
-				pageData:{}
-			}
-		},
-		computed: {
-			totalPages() {
-				return Math.ceil(this.total / this.pageSize)
-			}
-		},
-		watch: {
-			currentPage(newVal) {
-				this.$emit('page-change', {
-					page: newVal,
-					pageSize: this.pageSize
-				})
-			}
-		},
-		methods: {
-
-			// getPageConfig() {
-			// 	pageConfig(this.sourceId).then((res: any) => {
-			// 		this.pageData = res.data.ltmplConfig
-
-			// 		getEnumer(this.pageData)
-			// 	})
-			// },
-
-
-			prevPage() {
-				if (this.currentPage > 1) {
-					this.currentPage--
-				}
-			},
-			nextPage() {
-				if (this.currentPage < this.totalPages) {
-					this.currentPage++
-				}
-			},
-			sortColumn(col) {
-				if (!this.sortable || !col.sortable) return
-
-				if (this.sortField === col.key) {
-					this.sortOrder = this.sortOrder === 'asc' ? 'desc' : 'asc'
-				} else {
-					this.sortField = col.key
-					this.sortOrder = 'asc'
-				}
-
-				this.$emit('sort-change', {
-					field: col.key,
-					order: this.sortOrder
-				})
-			},
-			getSummary(col) {
-				if (col.summary === 'sum') {
-					const sum = (this.data || []).reduce((sum, row) => sum + (Number(row[col.key]) || 0), 0)
-					return isNaN(sum) ? '' : sum
-				}
-				return col.summaryText || ''
-			}
-		}
+<script setup>
+	// columns: [
+	//   { title: 'ID', key: 'id', width: '80px' },
+	//   { title: '姓名', key: 'name', width: '80px', sortable: true },
+	//   { title: '年龄', key: 'age', width: '80px', summary: 'sum', sortable: true },
+	//   { title: '成绩', key: 'score', width: '80px', summary: 'sum', sortable: true },
+	//   { title: '地址', key: 'address', width: '80px' }
+	// ]
+	import { onShow , onLoad } from "@dcloudio/uni-app"
+	import { ref, computed, watch, onMounted } from 'vue'
+	import wSearch from '../w-search/w-search.vue'
+	import { reportPageData, getPageKey, pageConfig, getEnum } from '../utils/apis/pageConfig'
+	
+	const props = defineProps({
+	  sourceId: {
+	    type: String,
+	    default: ''
+	  },
+	  mainCode: {
+	    type: String,
+	    default: ''
+	  },
+	  showSummary: {
+	    type: Boolean,
+	    default: false
+	  },
+	  sortable: {
+	    type: Boolean,
+	    default: false
+	  },
+	  pcolumns: {
+	    type: Array,
+	    required: false,
+	    default: []
+	  },
+	  pdata: {
+	    type: Array,
+	    required: false,
+	    default: []
+	  },
+	  pageSize: {
+	    type: Number,
+	    default: 10
+	  },
+	  total: {
+	    type: Number,
+	    required: false,
+	    default: 0
+	  },
+	  loading: {
+	    type: Boolean,
+	    default: false
+	  },
+	  pagination: {
+	    type: Boolean,
+	    default: false
+	  }
+	})
+	
+	const emit = defineEmits(['page-change', 'sort-change'])
+	
+	const currentPage = ref(1)
+	const bodyHeight = ref(1154)
+	const sortField = ref('')
+	const sortOrder = ref('asc')
+	const pageData = ref({})
+	const pageConfigs = ref({})
+	const columns = ref([])
+	const data = ref([])
+	const query = ref('')
+	const sourceId=ref('')
+	const totalPages = computed(() => {
+	  return Math.ceil(props.total / props.pageSize)
+	})
+	
+	const ccolumns = computed(() => {
+	  let datas = columns.value || props.pcolumns
+	  datas = columns.value.map((item) => {
+	    return {
+	      title: item.title,
+	      key: item.sourceId,
+	      summary: item.aggFunc,
+	      width: "100px"
+	    }
+	  })
+	  return datas
+	})
+	
+	const cdata = computed(() => {
+	  let datas = data.value || props.pdata
+	  datas = data.value.map((item) => {
+	    return {
+	      ...item.fieldMap
+	    }
+	  })
+	  return datas
+	})
+	
+	watch(currentPage, (newVal) => {
+	  emit('page-change', {
+	    page: newVal,
+	    pageSize: props.pageSize
+	  })
+	})
+	
+	onLoad((option) => {
+	  console.log('kkkk')
+	  sourceId.value=props.sourceId || option.sourceId
+	  getpageConfig()
+	})
+	
+	function getpageConfig() {
+	  pageConfig(sourceId.value).then((res) => {
+	    console.log(res.data.ltmplConfig)
+	    pageConfigs.value = res.data.ltmplConfig
+	    getPageData()
+	  })
+	}
+	
+	async function getPageData() {
+	  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
+	  })
+	}
+	
+	function search(e) {
+	  query.value = e
+	  getPageData()
+	}
+	
+	function prevPage() {
+	  if (currentPage.value > 1) {
+	    currentPage.value--
+	  }
+	}
+	
+	function nextPage() {
+	  if (currentPage.value < totalPages.value) {
+	    currentPage.value++
+	  }
+	}
+	
+	function sortColumn(col) {
+	  if (!props.sortable || !col.sortable) return
+	
+	  if (sortField.value === col.key) {
+	    sortOrder.value = sortOrder.value === 'asc' ? 'desc' : 'asc'
+	  } else {
+	    sortField.value = col.key
+	    sortOrder.value = 'asc'
+	  }
+	
+	  emit('sort-change', {
+	    field: col.key,
+	    order: sortOrder.value
+	  })
+	}
+	
+	function getSummary(col) {
+	  if (col.summary === 'sum') {
+	    const sum = (cdata.value || []).reduce((sum, row) => sum + (Number(row[col.key])) || 0, 0)
+	    return isNaN(sum) ? '' : sum
+	  }
+	  return col.summaryText || ''
 	}
 </script>
 
 <style scoped>
 	.smart-table-container {
 		width: 100%;
-		border-radius: 8px;
+		/* border-radius: 8px; */
 		overflow: hidden;
 		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
 	}
@@ -188,6 +246,7 @@
 	}
 
 	.header-cell {
+		
 		padding: 12px 16px;
 		width: 200px;
 		/* min-width: 200px; */

package/w-search/w-search.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="search-box">
-			<view class="left">
+			<view class="left" v-if="props.criterias.length">
 				<!-- <view class="search-icon">
           <wd-icon name="search" size="12px" ></wd-icon>
         </view> -->
@@ -99,7 +99,7 @@
 
 			switch (item.extControlType) {
 				case 'daterange':
-					data[`${item.sourceId}`] = []
+					data[`${item.sourceId}`] =item.transDefaultValue ||""
 					break;
 				default:
 					data[`${item.sourceId}`] = ''
@@ -191,9 +191,7 @@
 
 
 						if (item.extControlType === 'daterange') {
-							d = `c_${key}=${element?.map((mis : any) => {
-								return dayjs(mis).format('YYYY-MM-DD')
-							}).join('~')}`
+							d = `c_${key}=${element}`
 							data.push(d)
 							return
 						}