w-ui-v1 1.0.63 → 1.0.65

package/package.json

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

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)
+						}
+			
+			
 					}
 				})
-                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 })
+					.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

@@ -141,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]
 		  })

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()
 				})
@@ -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]

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

@@ -18,6 +18,11 @@
 	    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
 	    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="['是','否']"
 	    @confirm="(e) => { change(e) }" @clear="clear" />
+		<wd-picker v-else-if="subItem.extControlType === 'yes-no-switch'" :readonly="subItem.disabled" :label="subItem.title"
+		  label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
+		  :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
+		  :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :columns="['是','否']"
+		  @confirm="(e) => { change(e) }" @clear="clear" />
 	  
 	  <wd-select-picker v-else-if="subItem.controlType === 'select'&&subItem.extControlType === 'multiselect'" :readonly="subItem.disabled" :label="subItem.title"
 	    label-width="100px" :prop="subItem.id" clearable :modelValue="modelValue"
@@ -212,7 +217,7 @@ const modelValue = computed(() => {
 	}
 	
 	if(props.subItem.extControlType === 'datetime'){
-		return props.model[props.subItem.id]?dayjs(props.model[props.subItem.id]).valueOf():''
+		return props.model[props.subItem.id]?dayjs(props.model[props.subItem.id]).valueOf():null
 	}
 	
 	

package/w-table/w-table.vue

@@ -118,6 +118,7 @@ function add() {
         <wSearch :criterias="pageData.criterias" @search="search" v-if="pageData.buttons.includes('query')">
         </wSearch>
         <view>
+		  <slot name="button"></slot>
           <!-- 添加按钮 -->
           <wd-button v-if="pageData.buttons.includes('dtmplAdd')" type="icon" icon="add" @click="add" />
         </view>