w-ui-v1 1.0.59 → 1.0.61

package/package.json

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

package/utils/apis/pageConfig.ts

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

package/w-add/w-add.vue

@@ -91,8 +91,13 @@ const props = defineProps({
 		type: String,
 		default: ''
 	},
+	mainCode: {
+		type: String,
+		default: ''
+	},
 
 })
+const mainCode=ref('')
 const sourceId = ref('')
 const pageConf = ref({ groups: [] })
 const form = ref()//基本数据表单
@@ -110,6 +115,7 @@ const Enumcolumn = ref({})
 const pointSourceId = ref('')
 onLoad((option: any) => {
 	sourceId.value = props.sourceId || option.sourceId
+	mainCode.value=props.mainCode || option.mainCode
 	getPageConfig()
 })
 
@@ -212,7 +218,7 @@ async function handleSubmit() {
 				})
 
 				try {
-					const res = await addPageDataSave(sourceId.value, data)
+					const res = await addPageDataSave(sourceId.value,mainCode.value, data)
 					if (res.data.status === 'success') {
 						toast.success("保存成功")
 						uni.navigateBack({

package/w-card/w-card.vue

@@ -149,9 +149,20 @@ function goto(type: string, item: any = {}, subItem: any = {}) {
       if (props.actionType === 'relation') {
         emits('edit')
       }
-      uni.navigateTo({
-        url: `/pages/edit/edit?sourceId=${props.sourceId}&code=${props.itemData.code}`,
-      })
+	  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]
+		  })
+		  
+		  uni.navigateTo({
+		    url: `/pages/edit/edit?sourceId=${con.id}&code=${props.itemData.code}`,
+		  })
+	  }else{
+		  uni.navigateTo({
+		    url: `/pages/edit/edit?sourceId=${props.sourceId}&code=${props.itemData.code}`,
+		  })
+	  }
+      
       break
     case 'openPage':
       uni.navigateTo({
@@ -192,6 +203,7 @@ const dele = () => {
 
 //更多按钮点击事件
 const moreBtnsSelect = (item: any) => {
+	
   switch (item.item.actionType) {
     case 'submit':
       actionBtn(item.item)

package/w-edit/w-edit.vue

@@ -219,71 +219,17 @@
 	}
 	//保存
 	async function handleSubmit() {
-
-		if (isArray(form.value)) {
-			let promiseArr = form.value.map((item : any) => {
-				return item.validate()
-			})
-
-			Promise.all(promiseArr).then(async (valid) => {
-				let isTrue = valid.filter((item : any) => {
-					return !item.valid
+        if(form.value){
+			if (isArray(form.value)) {
+				let promiseArr = form.value.map((item : any) => {
+					return item.validate()
 				})
-				if (isTrue.length === 0) {
-					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
-							})
-						}
+			
+				Promise.all(promiseArr).then(async (valid) => {
+					let isTrue = valid.filter((item : any) => {
+						return !item.valid
 					})
-					data['唯一编码'] = model.value['唯一编码']
-					try {
-						const res = await addPageDataSave(sourceId.value, data)
-						if (res.data.status === 'success') {
-							toast.success("保存成功")
-							uni.navigateBack({
-								success: () => {
-
-									uni.$emit('editeDataSAC', { 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')
-				})
-
-
-
-		} else {
-
-			form.value
-				.validate()
-				.then(async ({ valid, errors }) => {
-					if (valid) {
+					if (isTrue.length === 0) {
 						toast.loading({
 							message: '保存中...',
 							duration: 0
@@ -295,7 +241,7 @@
 									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) => {
@@ -311,25 +257,119 @@
 								toast.success("保存成功")
 								uni.navigateBack({
 									success: () => {
-
+			
 										uni.$emit('editeDataSAC', { 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')
-				})
+					.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
+									})
+								}
+							})
+							data['唯一编码'] = model.value['唯一编码']
+							try {
+								const res = await addPageDataSave(sourceId.value, data)
+								if (res.data.status === 'success') {
+									toast.success("保存成功")
+									uni.navigateBack({
+										success: () => {
+			
+											uni.$emit('editeDataSAC', { 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')
+					})
+			}
+		}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
+					})
+				}
+			})
+			data['唯一编码'] = model.value['唯一编码']
+			try {
+				const res = await addPageDataSave(sourceId.value, data)
+				if (res.data.status === 'success') {
+					toast.success("保存成功")
+					uni.navigateBack({
+						success: () => {
+						
+							uni.$emit('editeDataSAC', { entityCode: res.data.entityCode, sourceId: res.data.sourceId })
+						}
+					})
+				} else {
+					toast.error(res.data.message || '保存失败"')
+				}
+						
+			} catch (error) {
+				toast.error(error)
+			}
 		}
+		
 	}
 
 	//选择数据

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

@@ -26,7 +26,7 @@
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" @confirm="(e) => { change(e) }"
       @clear="clear" />
 
-    <wd-cell v-else-if="subItem.extControlType === 'relselect'" title-width="100px" :prop="subItem.id"
+    <wd-cell v-else-if="subItem.extControlType === 'relselect'||subItem.extControlType === 'table-entity-select'" title-width="100px" :prop="subItem.id"
       :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" :title="subItem.title">
       <view style="text-align: left">
         <wSelectPicker @confirm="wSelectPickerconfirm" :modelValue="modelValue" :readonly="subItem.disabled"
@@ -89,7 +89,8 @@ const modelValue = computed(() => {
   switch (props.subItem.extControlType) {
     case 'datetime':
       return props.model[props.subItem.id] ? dayjs(props.model[props.subItem.id]).valueOf() : null
-
+    
+	case 'table-entity-select':
     case 'relselect':
       if (props.subItem.max === 1) {
         return props.model[props.subItem.id] ? props.model[props.subItem.id].split('@R@')[0] : ''

package/w-login/w-login.vue

@@ -27,10 +27,14 @@
 	const model = reactive<{
 		username : string
 		password : string
+		remember:boolean
 	}>({
-		username: '',
-		password: '',
+		username:uni.getStorageSync("username") ||'',
+		password:uni.getStorageSync("password") ||'',
+		remember:uni.getStorageSync("remember")||false
 	})
+	
+	
 
 	const form = ref()
 
@@ -43,6 +47,7 @@
 
 	// 登录
 	function handleLogin() {
+		console.log(model)
 		showLoading('登录中...')
 		login(model.username, model.password, pKey.value).then(({ data } : any) => {
 			if (data.status === 'error') {
@@ -50,6 +55,18 @@
 			}
 			showSuccess('登录成功')
 			uni.setStorageSync('token', data.token)
+			// 记住密码
+			if(model.remember){
+				uni.setStorageSync('remember', model.remember)
+				uni.setStorageSync('password', model.password)
+				uni.setStorageSync('username', model.username)
+			}else{
+				// 忘记密码
+				uni.removeStorageSync('remember')
+				uni.removeStorageSync('password')
+				uni.removeStorageSync('username')
+			}
+			
 			getUserConfig().then(({ data } : any) => {
 				uni.setStorageSync('userInfo', {
 					...data.user
@@ -95,6 +112,9 @@
 						placeholder="请输入用户名" :rules="[{ required: true, message: '请填写用户名' }]" />
 					<wd-input v-model="model.password" label="密码" label-width="100px" prop="password" show-password
 						clearable placeholder="请输入密码" :rules="[{ required: true, message: '请填写密码' }]" />
+						<view style="padding-left: 15px;">
+							<wd-checkbox  v-model="model.remember" shape="square">记住密码</wd-checkbox>
+						</view>
 				</wd-cell-group>
 				<view class="footer">
 					<wd-button type="primary" block :round="false" @click="handleSubmit">

package/w-table/w-table.vue

@@ -102,7 +102,7 @@ async function queryList(pageNo: number, pageSize: number) {
 // 点击添加按钮
 function add() {
   uni.navigateTo({
-    url: `/pages/add/add?sourceId=${sourceId.value}`,
+    url: `/pages/add/add?sourceId=${sourceId.value}&mainCode=${mainCode.value}`,
   })
 }