w-ui-v1 1.1.39 → 1.1.41

package/index.ts

@@ -19,12 +19,14 @@ import WScanBindingSensor from './w-scan-binding-sensor/w-scan-binding-sensor.vu
 import WUpdateVersion from './w-update-version/w-update-version.vue'
 import WTree from './w-tree/w-tree.vue'
 import WTreeAddTableVue from './w-tree-add-table/w-tree-add-table.vue'
+import WBorrowAddVue from './w-add/w-borrow-add.vue'
 import {menu} from './utils/apis/menu'
 import request from './utils/http'
 import nfc from './utils/nfc'
 import iData from './utils/idata-scan'
 import {getPageKey,getDataTotal} from './utils/apis/pageConfig'
 import { changeLanguage ,changeLanguageConmon} from './Locale'
+ 
 const coms: any[] = [
   wTest,
   wLogin,
@@ -45,7 +47,8 @@ const coms: any[] = [
   WScanBindingSensor,
   WUpdateVersion,
   WTree,
-  WTreeAddTableVue
+  WTreeAddTableVue,
+  WBorrowAddVue
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/utils/http.ts

@@ -42,6 +42,10 @@ export default function request(options: any): Promise<any> {
           uni.reLaunch({ url: '/pages/login/login' })
           // TODO 401
         }
+        if (res.statusCode === 403) {
+          uni.showToast({ title: '权限不足', icon: 'none' })
+          // TODO 403
+        }
         if (res.statusCode === 404) {
           uni.showToast({ title: '请求失败', icon: 'none' })
           reject(res)

package/w-add/w-add.vue

@@ -485,6 +485,21 @@ function addrow(key: any) {
 	})
 	
 	model.value[key].push(t)
+	
+	//开启监听
+	uni.$on('addrowSAC',function(data:any){
+		console.log(data)
+		uni.$off('addrowSAC')
+	})
+	
+	uni.navigateTo({
+		url:`/pages/add/borrow-add`,
+		success() {
+			uni.$emit('sendrowSAC',data)
+		}
+	})
+	
+	
 }
 //删除一行
 function remove(key: any, index: any, title: string) {

package/w-add/w-borrow-add.vue

@@ -0,0 +1,340 @@
+
+<template>
+	<view>
+		<view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
+			<wd-loading />
+		</view>
+		<view v-else>
+			<wd-collapse v-model="value">
+				<wd-collapse-item custom-body-class="collapse-custom-class" :title="changeLanguageConmon(item.title)" :name="item.id"
+					v-for="(item, index) in pageConf.groups" :key="index">
+					<view v-if="item.type === 'fieldGroup'">
+						<wd-card>
+							<wd-form ref="form" :model="model">
+								<wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
+									<wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn"
+										v-model:model-value="model[subItem.id]" />
+								</wd-cell-group>
+
+							</wd-form>
+						</wd-card>
+					</view>
+					<view v-if="item.type === 'relation'">
+						<view class="row-add">
+							<wd-button v-if="item.buttons.includes('selectAdd')" hairline type="info" size="small"
+								icon="add" @click="selectrow(item)">{{changeLanguageConmon('选择')}}</wd-button>
+							<wd-button v-if="item.buttons.includes('dtmplAdd')" hairline type="info" size="small"
+								icon="add" @click="add(item)">{{changeLanguageConmon('新增')}}</wd-button>
+						</view>
+
+						<view v-if="relationLoading[item.id]"
+							style="height: 100px;display: flex;justify-content: center;align-items: center;">
+							<wd-loading />
+						</view>
+
+						<!-- 卡片 -->
+						<view v-else class="card-list">
+							<w-card @edit="() => { editItem(item, subitem, subindex) }"
+								@delet="() => { deletItem(item, subitem, subindex) }" :actionType="item.type"
+								v-for="(subitem, subindex) in selectData[item.id]" :key="subindex" :car-index="subindex"
+								:page="{
+									rowActions: item.rowActions || [],
+									buttons: item.buttons || [],
+									ractions: item.ractions || [],
+									columns: item.fields || []
+								}" :item-data="subitem" :source-id="item.pointSourceId" />
+						</view>
+
+						<view class="row-add" v-if="item.buttons.includes('rowAdd')">
+							<wd-button hairline type="info" size="small" icon="add"
+								@click="addrow(item.id)">{{changeLanguageConmon('加一条')}}</wd-button>
+						</view>
+					</view>
+				</wd-collapse-item>
+			</wd-collapse>
+			<view class="footer-button">
+				<wd-button :round="false" block @click="handleSubmit" icon="save">{{changeLanguageConmon('保存')}}</wd-button>
+			</view>
+		</view>
+		<wd-message-box />
+		<wd-toast />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { changeLanguageConmon} from '../Locale'
+import wCard from '../w-card/w-card.vue'
+import wFromControl from '../w-form-control/w-form-control.vue'
+import { onLoad, onUnload } from '@dcloudio/uni-app'
+import { ref, defineProps, reactive, watch,onBeforeUpdate } from 'vue';
+import {
+	addPageConfig,
+	getEnum,
+	addPageDataSave,
+	getSelectData
+} from '../utils/apis/pageConfig'
+import { useMessage } from 'wot-design-uni'
+import { useToast } from 'wot-design-uni'
+const toast = useToast()
+const message = useMessage()
+defineOptions({
+	name: 'w-borrow-add'
+})
+
+interface Props {
+	sourceId?:string
+	mainCode?:string
+}
+
+const props = defineProps<Props>()
+const mainCode=ref('')
+const sourceId = ref('')
+const pageConf = ref({ groups: [] })
+const form = ref()//基本数据表单
+//表单数据
+const model = ref({})
+const relationID = ref('')
+const modelsRef = {
+
+}
+const relationLoading = reactive({})
+const checkboxvalue = ref([])
+const loading = ref(false)
+const value = ref([])
+const Enumcolumn = ref({})
+const pointSourceId = ref('')
+onLoad((option: any) => {
+	sourceId.value = props.sourceId || option.sourceId
+	mainCode.value=props.mainCode || option.mainCode
+	getPageConfig()
+})
+
+
+watch(checkboxvalue, (value) => {
+
+	getSelectDataPxoy(value)
+}, {
+	immediate: false,
+	deep: true
+
+})
+
+onBeforeUpdate(()=>{
+	
+	if(props.mainCode){
+		mainCode.value=props.mainCode
+	}
+	if(props.sourceId){
+		sourceId.value = props.sourceId
+	}
+})
+
+onUnload(() => {
+	// 取消监听勾选列表页面事件
+	uni.$off('getCheckData')
+
+})
+
+// 获取页面配置
+function getPageConfig() {
+	
+	uni.$on('sendrowSAC',(res:any)=>{
+		
+		console.log(res)
+		let data={
+				groups:[res]
+			}
+		
+			pageConf.value = data
+		
+			let fieldGroup = {}
+			let relation = {}
+			data.groups.forEach((item: any) => {
+				value.value.push(item.id)
+				if (item.type === 'relation') {
+					let t = []
+					relation[item.id] = t
+					relationLoading[item.id] = false
+				}
+		
+		
+				if (item.type === 'fieldGroup') {
+		
+					item.fields.forEach((subItem: any) => {
+						if (subItem.extControlType === 'datetime') {
+							fieldGroup[subItem.id] = null
+							return
+						}
+						fieldGroup[subItem.id] = subItem.defaultValue || ''
+		
+					})
+				}
+		
+			})
+			model.value = {
+				...relation,
+				...fieldGroup//一般为基本信息
+			}
+			getEnumer()
+			loading.value = false
+	})
+	
+
+}
+//获取枚举
+async function getEnumer() {
+	let params = []
+	pageConf.value.groups?.forEach((item: any) => {
+		item.fields?.forEach((subItem: any) => {
+			if (subItem.extControlType === 'select') {
+				params.push(`mstrucIds=${subItem.mstrucId}`)
+			}
+		})
+	});
+	if (!params.length) return
+	const res = await getEnum(params.join("&"))
+	Enumcolumn.value = res.data?.enumMap || {}
+}
+
+
+//保存
+async function handleSubmit() {
+    
+	console.log(model)
+	
+}
+
+//跳转勾选页面数据
+function selectrow(item: any) {
+	//监听勾选列表页面事件
+	uni.$on('getCheckData', function (data: any) {
+		checkboxvalue.value = data.checkData
+	})
+	relationID.value = item.id
+	pointSourceId.value = item.pointSourceId
+	let data = selectData.value[relationID.value]?.map((item) => {
+		return item.code
+	})
+	uni.navigateTo({
+		url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`,
+		success: () => {
+			uni.$emit('checkeDData', { checkData: data || [] })
+		}
+	})
+}
+const selectData = ref({})
+//获取勾选数据
+async function getSelectDataPxoy(values: string[]) {
+	if (values.length === 0) return model.value[relationID.value] = []
+	//获取勾选数据
+	let codes = ''
+	values.forEach((item: any) => {
+		codes += `codes=${item}&`
+	})
+
+	relationLoading[relationID.value] = true
+	if (!relationID.value) return
+	const res = await getSelectData(relationID.value, codes)
+	selectData.value[relationID.value] = res.data.entities
+	model.value[relationID.value] = selectData.value[relationID.value].map((item: any) => {
+		return item.code
+	})
+	relationLoading[relationID.value] = false
+}
+
+//删除勾选数据
+const deletItem = (item: any, subitem: any, index: any) => {
+	relationID.value = item.id
+	selectData.value[item.id].splice(index, 1)
+	let data = selectData.value[item.id].map((item: any) => {
+		return item.code
+	})
+	checkboxvalue.value = data || []
+}
+
+//点击编辑按钮
+const editItem = (item: any, subitem: any, index: any) => {
+	relationID.value = item.id
+	//监听编辑页面事件
+	uni.$on('editeDataSAC', function (data: any) {
+
+		checkboxvalue.value = selectData.value[item.id]?selectData.value[item.id].map((item: any) => {
+			return item.code
+		}):[data.entityCode]
+		// 取消监听编辑页面事件
+		uni.$off('editeDataSAC')
+	})
+}
+
+//新增按钮
+const add = (item: any) => {
+	relationID.value = item.id
+	//监听添加数据完成事件
+	uni.$on('addDataSAC', function (data: any) {
+		checkboxvalue.value = selectData.value[item.id]?[...selectData.value[item.id].map((item: any) => {
+			return item.code
+		}), data.entityCode]:[data.entityCode]
+		// 取消监听添加数据完成事件
+		uni.$off('addDataSAC')
+	})
+	//跳转新增页面
+	uni.navigateTo({
+		url: `/pages/add/add?sourceId=${item.pointSourceId}`,
+	})
+}
+
+
+//新加一行
+function addrow(key: any) {
+
+	let data = pageConf.value.groups.find((item: any) => {
+		return item.id === key
+	})
+	let t = {}
+	data.fields.forEach((subItem: any) => {
+		t[subItem.id] = subItem.defaultValue || ''
+	})
+	
+	model.value[key].push(t)
+}
+//删除一行
+function remove(key: any, index: any, title: string) {
+	message
+		.confirm({
+			msg: changeLanguageConmon(`${title}--确定删除第${index + 1}条数据吗？`),
+			title: changeLanguageConmon('删除')
+		})
+		.then(() => {
+			model.value[key].splice(index, 1)
+		})
+		.catch(() => {
+			console.log('点击了取消按钮')
+		})
+
+}
+</script>
+
+<style scoped lang="scss">
+.footer-button {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 5px 10px 5px 10px;
+	position: sticky;
+	bottom: 0;
+	background-color: #fff;
+
+}
+
+.row-add {
+	// background-color: #fff;
+	padding: 0 0 8px 0;
+	display: flex;
+	justify-content: center;
+	gap: 5px;
+}
+
+:deep(.collapse-custom-class) {
+	background-color: #f8f8f8;
+	padding: 15px 0 0.5px 0 !important;
+}
+</style>

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

@@ -94,6 +94,15 @@
 	      @clear="clear" clearable />
 	  </view>
 	</wd-cell>
+	<wd-cell v-else-if="subItem.extControlType === 'table-entity-select'" title-width="100px" :prop="subItem.id"
+	  :rules="[{ required: subItem.required, message: `${changeLanguageConmon('请选择')}${changeLanguageConmon(subItem.title)}` }]" :title="changeLanguageConmon(subItem.title)">
+	  <view style="text-align: left">
+	    <wSelectPicker  @confirm="wSelectPickerconfirm" :modelValue="modelValue" :disabled="subItem.disabled"
+	      :max="subItem.max==='1'?1:0"
+	      :placeholder="subItem.disabled ? changeLanguageConmon('无需输入') : `${changeLanguageConmon('请输入')}${changeLanguageConmon(subItem.title)}`" :source-id="subItem.sourceId" filterable
+	      @clear="clear" clearable />
+	  </view>
+	</wd-cell>
 	
 	<wd-cell v-else-if="subItem.extControlType === 'file'||subItem.extControlType === 'picture'"
 	  :rules="[{ required: subItem.required, message: `${changeLanguageConmon('请选择')}${changeLanguageConmon(subItem.title)}文件` }]" :title="subItem.title"
@@ -235,6 +244,20 @@ const modelValue = computed(() => {
 		
 	}
 	
+	
+	if(props.subItem.extControlType === 'table-entity-select'){
+		if(props.model[props.subItem.id]){
+			let dataArr1=props.model[props.subItem.id].split('@,@')
+			let dataArr2=dataArr1.map((item:any)=>{
+				return item.split("@R@")[0]
+			})
+			return dataArr2
+		}else{
+			return[]
+		}
+		
+	}
+	
 	if(props.subItem.extControlType === 'file'){
 		return props.model[props.subItem.id]?[JSON.parse(props.model[props.subItem.id])['base']]:[]
 	}

package/w-tree/w-tree.vue

@@ -112,7 +112,7 @@
 		if(selectedItems.length>1){
 			return selectedItems[selectedItems.length - 2].label + '/' + selectedItems[selectedItems.length - 1].label
 		}else{
-			return selectedItems[selectedItems.length - 1].label
+			return selectedItems[selectedItems.length - 1]?.label
 		}
 	}
 </script>

package/w-tree-add-table/w-tree-add-table.vue

@@ -3,9 +3,9 @@
 		<w-tree :handleConfirm="handleConfirm" @handleConfirm="handleConfirm"></w-tree>
 		<w-add :mainCode="mainCode" :sourceId="sourceId"></w-add>
 	</view>
-	
-</template>
-
+	
+</template>
+
 <script lang="ts" setup>
 	import wTree from '../w-tree/w-tree.vue'
 	import wAdd from '../w-add/w-add.vue'
@@ -18,8 +18,8 @@
 	const handleConfirm=(data:any)=>{
 		mainCode.value=data.data.value[data.data.value.length-1]
 		sourceId.value=data.leafRatmplId
-	}
-</script>
-
-<style>
+	}
+</script>
+
+<style>
 </style>