w-ui-v1 1.0.62 → 1.0.64

package/package.json

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

package/utils/apis/pageConfig.ts

@@ -20,7 +20,7 @@ export function addPageConfig(sourceId: string) {
 }
 
 //新增页面提交保存
-export function addPageDataSave(sourceId: string,mainCode: string, data: any) {
+export function addPageDataSave(sourceId: string,mainCode: string="", data: any) {
   return request({
     url: `/v3/dtmpl/data`,
     method: 'POST',

package/utils/index.ts

@@ -0,0 +1,18 @@
+import {
+getEnum
+} from './apis/pageConfig'
+export const getEnumer=async(pageData:any)=>{
+	let params = []
+	pageData.columns.forEach((item: any) => {
+	  if (item.controlType === 'select') {
+	    params.push(`mstrucIds=${item.mstrucId}`)
+	  }
+	  if (item.controlType === 'multiselect') {
+	    params.push(`mstrucIds=${item.mstrucId}`)
+	  }
+	
+	});
+	if (!params.length) return
+	const res = await getEnum(params.join("&"))
+	return res.data?.enumMap || {}
+}

package/w-add/w-add.vue

@@ -192,55 +192,204 @@ async function getEnumer() {
 //保存
 async function handleSubmit() {
 
-	form.value[0]
-		.validate()
-		.then(async ({ valid, errors }) => {
-			if (valid) {
-				toast.loading({
-					message: '保存中...',
-					duration: 0
+	// form.value[0]
+	// 	.validate()
+	// 	.then(async ({ valid, errors }) => {
+	// 		if (valid) {
+	// 			toast.loading({
+	// 				message: '保存中...',
+	// 				duration: 0
+	// 			})
+	// 			let data = {}
+	// 			pageConf.value.groups?.forEach((item: any) => {
+	// 				if (item.type === 'fieldGroup') {
+	// 					item.fields?.forEach((subItem: any) => {
+	// 						data[subItem.id] = model.value[subItem.id]
+	// 					})
+	// 				}
+
+	// 				if (item.type === 'relation') {
+	// 					data[`${item.id}.$$flag$$`] = true
+	// 					model.value[item.id]?.forEach((subItem: any, index: number) => {
+	// 						data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+	// 						data[`${item.id}[${index}].唯一编码`] = subItem
+	// 					})
+	// 				}
+	// 			})
+ //                console.log(data,'jjj')
+	// 			try {
+	// 				const res = await addPageDataSave(sourceId.value,mainCode.value, data)
+	// 				if (res.data.status === 'success') {
+	// 					toast.success("保存成功")
+	// 					uni.navigateBack({
+	// 						success: () => {
+	// 							uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+	// 						}
+	// 					})
+	// 				} else {
+	// 					toast.error(res.data.message || '保存失败"')
+	// 				}
+
+	// 			} catch (error) {
+	// 				toast.error(error)
+	// 			}
+
+
+	// 		}
+	// 	})
+	// 	.catch((error) => {
+	// 		console.log(error, 'error')
+	// 	})
+if(form.value){
+			if (Array.isArray(form.value)) {
+				let promiseArr = form.value.map((item : any) => {
+					return item.validate()
 				})
-				let data = {}
-				pageConf.value.groups?.forEach((item: any) => {
-					if (item.type === 'fieldGroup') {
-						item.fields?.forEach((subItem: any) => {
-							data[subItem.id] = model.value[subItem.id]
+			
+				Promise.all(promiseArr).then(async (valid) => {
+					let isTrue = valid.filter((item : any) => {
+						return !item.valid
+					})
+					if (isTrue.length === 0) {
+						toast.loading({
+							message: '保存中...',
+							duration: 0
 						})
-					}
-
-					if (item.type === 'relation') {
-						data[`${item.id}.$$flag$$`] = true
-						model.value[item.id]?.forEach((subItem: any, index: number) => {
-							data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
-							data[`${item.id}[${index}].唯一编码`] = subItem
+						let data = {}
+						pageConf.value.groups?.forEach((item : any) => {
+							if (item.type === 'fieldGroup') {
+								item.fields?.forEach((subItem : any) => {
+									data[subItem.id] = model.value[subItem.id]
+								})
+							}
+			
+							if (item.type === 'relation') {
+								data[`${item.id}.$$flag$$`] = true
+								model.value[item.id]?.forEach((subItem : any, index : number) => {
+									data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+									data[`${item.id}[${index}].唯一编码`] = subItem
+								})
+							}
 						})
+						
+						try {
+							const res = await addPageDataSave(sourceId.value, null,data)
+							if (res.data.status === 'success') {
+								toast.success("保存成功")
+								uni.navigateBack({
+									success: () => {
+			
+										uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+									}
+								})
+							} else {
+								toast.error(res.data.message || '保存失败"')
+							}
+			
+						} catch (error) {
+							toast.error(error)
+						}
+			
+			
 					}
 				})
-
-				try {
-					const res = await addPageDataSave(sourceId.value,mainCode.value, data)
-					if (res.data.status === 'success') {
-						toast.success("保存成功")
-						uni.navigateBack({
-							success: () => {
-								uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+					.catch((error) => {
+						console.log(error, 'error')
+					})
+			
+			
+			
+			} else {
+				form.value
+					.validate()
+					.then(async ({ valid, errors }) => {
+						if (valid) {
+							toast.loading({
+								message: '保存中...',
+								duration: 0
+							})
+							let data = {}
+							pageConf.value.groups?.forEach((item : any) => {
+								if (item.type === 'fieldGroup') {
+									item.fields?.forEach((subItem : any) => {
+										data[subItem.id] = model.value[subItem.id]
+									})
+								}
+			
+								if (item.type === 'relation') {
+									data[`${item.id}.$$flag$$`] = true
+									model.value[item.id]?.forEach((subItem : any, index : number) => {
+										data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+										data[`${item.id}[${index}].唯一编码`] = subItem
+									})
+								}
+							})
+							
+							try {
+								const res = await addPageDataSave(sourceId.value, null,data)
+								if (res.data.status === 'success') {
+									toast.success("保存成功")
+									uni.navigateBack({
+										success: () => {
+			
+											uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+										}
+									})
+								} else {
+									toast.error(res.data.message || '保存失败"')
+								}
+			
+							} catch (error) {
+								toast.error(error)
 							}
-						})
-					} else {
-						toast.error(res.data.message || '保存失败"')
-					}
-
-				} catch (error) {
-					toast.error(error)
+			
+			
+						}
+					})
+					.catch((error) => {
+						console.log(error, 'error')
+					})
+			}
+		}else{
+			toast.loading({
+				message: '保存中...',
+				duration: 0
+			})
+			let data = {}
+			pageConf.value.groups?.forEach((item : any) => {
+				if (item.type === 'fieldGroup') {
+					item.fields?.forEach((subItem : any) => {
+						data[subItem.id] = model.value[subItem.id]
+					})
 				}
-
-
+						
+				if (item.type === 'relation') {
+					data[`${item.id}.$$flag$$`] = true
+					model.value[item.id]?.forEach((subItem : any, index : number) => {
+						data[`${item.id}[${index}].$$relation$$`] = item['relationNames'][0]
+						data[`${item.id}[${index}].唯一编码`] = subItem
+					})
+				}
+			})
+			
+			try {
+				const res = await addPageDataSave(sourceId.value, null,data)
+				if (res.data.status === 'success') {
+					toast.success("保存成功")
+					uni.navigateBack({
+						success: () => {
+						
+							uni.$emit('addDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+						}
+					})
+				} else {
+					toast.error(res.data.message || '保存失败"')
+				}
+						
+			} catch (error) {
+				toast.error(error)
 			}
-		})
-		.catch((error) => {
-			console.log(error, 'error')
-		})
-
+		}
 }
 
 //跳转勾选页面数据

package/w-card/w-card.vue

@@ -1,11 +1,4 @@
-<script lang="ts">
-//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
-export default {
-  options: {
-    styleIsolation: 'shared'//使css :deep()生效
-  }
-}
-</script>
+
 <script setup lang="ts">
 import WFormMessageBox from '../w-form-message-box/w-form-message-box.vue'
 import {
@@ -148,8 +141,9 @@ function goto(type: string, item: any = {}, subItem: any = {}) {
     case 'edit':
       if (props.actionType === 'relation') {
         emits('edit')
+		
       }
-	  if(props.page.classEditConfigs.length>0){
+	  if(props.page.classEditConfigs?.length>0){
 		 let con= props.page.classEditConfigs.find((item:any)=>{
 			  return item.preposes[0].defaultValue===props.itemData.fieldMap[item.preposes[0].id]
 		  })
@@ -242,7 +236,10 @@ const getTitleValue = (value: any, title: string) => {
   <wd-card >
 	<template #title>
 	    <view class="card-title-class">
-	     {{getTitleValue(visibleItems.find((item) => item.id === page.primaryColumn?.id), page.primaryColumn?.title) || ' '}}
+	       <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>
 	  </template>
 	
@@ -251,7 +248,7 @@ const getTitleValue = (value: any, title: string) => {
 
         <!-- // 标题 -->
         <view class="lable">
-          <text>{{ item.title }}:</text>
+          <text class="lable">{{ item.title }}:</text>
         </view>
 
         <!-- // 图片 -->
@@ -349,7 +346,7 @@ const getTitleValue = (value: any, title: string) => {
     padding: 8rpx 10rpx;
 
     .lable {
-      white-space: nowrap;
+      white-space: nowrap !important;
       // font-weight: 600;
       text-align: left;
       margin-right: 20rpx;
@@ -397,8 +394,17 @@ const getTitleValue = (value: any, title: string) => {
  
 
 }
-:deep(.card-title-class){
-    font-weight: 700 !important;
+.card-title-class{
+	display: flex;
+	align-items: center;
+    font-weight: 700 ;
+	gap: 4px;
+  }
+  .title-icon{
+	  width: 8px;
+	  height: 8px;
+	  border-radius: 100%;
+	  background-color: #4d80f0;
   }
 .btn {
   margin-left: 10rpx;

package/w-edit/w-edit.vue

@@ -220,7 +220,7 @@
 	//保存
 	async function handleSubmit() {
         if(form.value){
-			if (isArray(form.value)) {
+			if (Array.isArray(form.value)) {
 				let promiseArr = form.value.map((item : any) => {
 					return item.validate()
 				})
@@ -252,7 +252,7 @@
 						})
 						data['唯一编码'] = model.value['唯一编码']
 						try {
-							const res = await addPageDataSave(sourceId.value, data)
+							const res = await addPageDataSave(sourceId.value, null,data)
 							if (res.data.status === 'success') {
 								toast.success("保存成功")
 								uni.navigateBack({
@@ -305,7 +305,7 @@
 							})
 							data['唯一编码'] = model.value['唯一编码']
 							try {
-								const res = await addPageDataSave(sourceId.value, data)
+								const res = await addPageDataSave(sourceId.value, null,data)
 								if (res.data.status === 'success') {
 									toast.success("保存成功")
 									uni.navigateBack({
@@ -352,7 +352,7 @@
 			})
 			data['唯一编码'] = model.value['唯一编码']
 			try {
-				const res = await addPageDataSave(sourceId.value, data)
+				const res = await addPageDataSave(sourceId.value, null,data)
 				if (res.data.status === 'success') {
 					toast.success("保存成功")
 					uni.navigateBack({
@@ -417,6 +417,7 @@
 
 		//监听添加数据完成事件
 		uni.$on('addDataSAC', function (data : any) {
+			console.log(data,'kk')
 			checkboxvalue.value = selectData.value[item.id] ? [...selectData.value[item.id].map((item : any) => {
 				return item.code
 			}), data.entityCode] : [data.entityCode]