w-ui-v1 1.0.87 → 1.0.89

package/package.json

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

package/w-card/utils/utils.ts

@@ -204,6 +204,7 @@ export const downloadFile = (url : any) => {
 
 //获取枚举颜色 content: 406795063630012418@R@轴2
 export const getEnumColor = (enumMap : any[] = [], content : string) => {
+	console.log(enumMap,content)
 	if(typeof content!=='string') return null
 	let css=enumMap.find((item : any) => {
 		

package/w-card/w-card.vue

@@ -44,7 +44,7 @@ const props = defineProps({
 	  default:{}
   }
 })
-
+console.log(props.enumMap)
 //更多按钮
 const moreBtns = computed(() => {
   let data = []
@@ -230,17 +230,33 @@ const getTitleValue = (value: any, title: string) => {
   }
   return data
 }
+
+
 </script>
 
 <template>
   <wd-card >
 	<template #title>
-	    <view class="card-title-class">
-	       <view class="title-icon"></view>
-		   <view style="flex: 1; word-break:break-all">
-		   	{{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) || ' '}}
-		   </view>
-	    </view>
+		<view >
+			<view class="card-title-class">
+			   <view class="title-icon"></view>
+			   <view style="flex: 1; word-break:break-all">
+			   	{{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) || ' '}}
+			   </view>
+			   <!-- <view class="status-icon">
+			   	已完成成成
+			   </view> -->
+			   <wd-tag style="font-size: 15px;padding:0 4px;" :bg-color="getEnumColor(enumMap[page.labelColumn.mstrucId],itemData.fieldMap[page.labelColumn.id]).color" v-if="page.labelColumn?.id">
+			   {{
+				   itemData.fieldMap[page.labelColumn.id]
+			   }}
+			   </wd-tag>
+			</view>
+			<view style="font-size: 12px;margin-top: 8px;color: #ffaa00;">
+				{{getTitleValue(visibleItems.find((item) => item.id === page.secondColumn?.id), page.secondColumn?.title)}}
+			</view>
+		</view>
+	    
 	  </template>
 	
     <view class="table_collapse">
@@ -333,7 +349,7 @@ const getTitleValue = (value: any, title: string) => {
 
   color: #000;
   // background-color: #F8F8F8;
-  padding: 20rpx;
+  padding:0 0 20rpx 0;
 
   /* 添加过渡动画 */
   .cloum {
@@ -399,6 +415,7 @@ const getTitleValue = (value: any, title: string) => {
 	align-items: center;
     font-weight: 700 ;
 	gap: 4px;
+	
   }
   .title-icon{
 	  width: 8px;
@@ -406,6 +423,18 @@ const getTitleValue = (value: any, title: string) => {
 	  border-radius: 100%;
 	  background-color: #4d80f0;
   }
+  .status-icon{
+	  box-sizing: border-box;
+	  padding: 4px 15px;
+	  transform: rotate(45deg) translate(15px,-15px);
+	  text-align: center;
+	  color: #fff;
+	  font-size: 12px;
+	  // width: 85px;
+	  // height: 15px;
+	  background-color: #4d80f0;
+	  clip-path: polygon(20% 0%, 80% 0%, 100% 100%, 0% 100%);
+  }
 .btn {
   margin-left: 10rpx;
 }

package/w-search/w-search.vue

@@ -5,8 +5,8 @@
 				<!-- <view class="search-icon">
           <wd-icon name="search" size="12px" ></wd-icon>
         </view> -->
-				<wd-drop-menu>
-					<wd-drop-menu-item ref="dropMenu" title="搜索" @opened="handleOpened">
+				<wd-drop-menu >
+					<wd-drop-menu-item ref="dropMenu"  title="更多" @opened="handleOpened">
 						<view v-for="(item, index) in props.criterias" :key="index">
 							<!-- <wSelectPicker :model-value="searchData[item.sourceId] ? searchData[item.sourceId].value : ''"
                 v-if="item.extControlType === 'relselectvalue' || item.extControlType === 'entity-select'" type="radio"
@@ -51,7 +51,15 @@
 					</wd-drop-menu-item>
 				</wd-drop-menu>
 			</view>
-
+            <view style="flex:1;" v-if="primaryCriteria?.extControlType==='text'">
+            	<wd-search @clear="search" v-model="searchData[primaryCriteria.id]" :placeholder="`搜索${primaryCriteria.title}`">
+					<template #suffix>
+						<view @click="search" style="padding:0 8px;">
+							<wd-icon name="search" />
+						</view>
+					</template>
+				</wd-search>
+            </view>
 		</view>
 	</view>
 </template>
@@ -73,6 +81,11 @@
 		criterias: {
 			type: Array,
 			default: []
+		},
+		//主搜索配置
+		primaryCriteria:{
+			type:Object,
+			default:{}
 		}
 	})
 
@@ -279,7 +292,7 @@
 
 <style scoped lang="scss">
 	.search-box {
-
+            display: flex;
 		.left {
 			// position: relative;
 

package/w-table/w-table.vue

@@ -43,7 +43,8 @@ const dataList = ref([])
 const pageData = ref<{
   criterias: []
   buttons: string[]
-}>({ criterias: [], buttons: [] })
+  primaryCriteria:{}
+}>({ criterias: [], buttons: [], primaryCriteria:{}})
 onLoad((option: any) => {
   sourceId.value = props.sourceId || option.sourceId
   mainCode.value =  props.mainCode ||option.mainCode
@@ -65,11 +66,11 @@ watch(() => props.sourceId, (value) => {
   immediate: false
 })
 // 获取页面配置
-function getPageConfig() {
-  pageConfig(sourceId.value).then((res: any) => {
+ function getPageConfig() {
+  pageConfig(sourceId.value).then(async(res: any) => {
     pageData.value = res.data.ltmplConfig
 	//获取枚举
-	Enumcolumn.value=getEnumer(pageData.value)
+	Enumcolumn.value=await getEnumer(pageData.value)
   })
 }
 
@@ -119,16 +120,17 @@ function add() {
 <template>
   <z-paging ref="paging" v-model="dataList" :show-loading-more-when-reload="true" @query="queryList">
     <template #top>
-      <view class="buttons">
+      <view >
         <!-- 搜索 -->
-        <wSearch :criterias="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
+        <wSearch :primaryCriteria="pageData.primaryCriteria" :criterias="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
         </wSearch>
-        <view>
-		  <slot name="buttons"></slot>
-          <!-- 添加按钮 -->
-          <wd-button v-if="pageData.buttons.includes('dtmplAdd')" type="icon" icon="add" @click="add" />
-        </view>
+        
       </view>
+	  <view style="display: flex;justify-content: flex-end;">
+	    <slot name="buttons"></slot>
+	    <!-- 添加按钮 -->
+	    <wd-button v-if="pageData.buttons.includes('dtmplAdd')" type="icon" icon="add" @click="add" />
+	  </view>
     </template>
     <!-- 卡片 -->
     <view class="card-list" v-if="dataList.length > 0">