w-ui-v1 1.1.35 → 1.1.37

package/index.ts

@@ -18,6 +18,7 @@ import WFormControlVue from './w-form-control/w-form-control.vue'
 import WScanBindingSensor from './w-scan-binding-sensor/w-scan-binding-sensor.vue'
 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 {menu} from './utils/apis/menu'
 import request from './utils/http'
 import nfc from './utils/nfc'
@@ -43,7 +44,8 @@ const coms: any[] = [
   WFormControlVue,
   WScanBindingSensor,
   WUpdateVersion,
-  WTree
+  WTree,
+  WTreeAddTableVue
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/w-add/w-add.vue

@@ -1,11 +1,4 @@
-<script lang="ts">
-//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
-export default {
-	options: {
-		styleIsolation: 'shared'//使css :deep()生效
-	}
-}
-</script>
+
 <template>
 	<view>
 		<view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
@@ -73,7 +66,7 @@ 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 } from 'vue';
+import { ref, defineProps, reactive, watch,onBeforeUpdate } from 'vue';
 import {
 	addPageConfig,
 	getEnum,
@@ -87,17 +80,13 @@ const message = useMessage()
 defineOptions({
 	name: 'w-add'
 })
-const props = defineProps({
-	sourceId: {
-		type: String,
-		default: ''
-	},
-	mainCode: {
-		type: String,
-		default: ''
-	},
 
-})
+interface Props {
+	sourceId?:string
+	mainCode?:string
+}
+
+const props = defineProps<Props>()
 const mainCode=ref('')
 const sourceId = ref('')
 const pageConf = ref({ groups: [] })
@@ -120,6 +109,7 @@ onLoad((option: any) => {
 	getPageConfig()
 })
 
+
 watch(checkboxvalue, (value) => {
 
 	getSelectDataPxoy(value)
@@ -129,6 +119,12 @@ watch(checkboxvalue, (value) => {
 
 })
 
+onBeforeUpdate(()=>{
+	console.log('ssss')
+	mainCode.value=props.mainCode
+	sourceId.value = props.sourceId
+})
+
 onUnload(() => {
 	// 取消监听勾选列表页面事件
 	uni.$off('getCheckData')
@@ -274,7 +270,7 @@ if(form.value){
 						})
 						
 						try {
-							const res = await addPageDataSave(sourceId.value, null,data)
+							const res = await addPageDataSave(sourceId.value, mainCode.value,data)
 							if (res.data.status === 'success') {
 								toast.success(changeLanguageConmon("保存成功"))
 								uni.navigateBack({
@@ -327,7 +323,7 @@ if(form.value){
 							})
 							
 							try {
-								const res = await addPageDataSave(sourceId.value, null,data)
+								const res = await addPageDataSave(sourceId.value, mainCode.value,data)
 								if (res.data.status === 'success') {
 									toast.success(changeLanguageConmon("保存成功"))
 									uni.navigateBack({
@@ -374,7 +370,7 @@ if(form.value){
 			})
 			
 			try {
-				const res = await addPageDataSave(sourceId.value, null,data)
+				const res = await addPageDataSave(sourceId.value, mainCode.value,data)
 				if (res.data.status === 'success') {
 					toast.success(changeLanguageConmon("保存成功"))
 					uni.navigateBack({
@@ -483,6 +479,7 @@ function addrow(key: any) {
 	data.fields.forEach((subItem: any) => {
 		t[subItem.id] = subItem.defaultValue || ''
 	})
+	
 	model.value[key].push(t)
 }
 //删除一行

package/w-tree/w-tree.vue

@@ -1,15 +1,17 @@
 <template>
-	<wd-col-picker label="选择地址" v-model="value" :columns="columns" :column-change="columnChange" :display-format="displayFormat"
+	<wd-col-picker :label="treeConfigs.branchTitle" v-model="value" :columns="columns" :column-change="columnChange" :display-format="displayFormat"
 		@confirm="handleConfirm"></wd-col-picker>
 </template>
 
 <script setup lang="ts">
-	import { ref, reactive, defineOptions, onMounted,defineProps } from 'vue'
+	import { ref, reactive, defineOptions, onMounted,defineProps,defineEmits } from 'vue'
 	import { treeConfigApi, treeDataApi,treeNodeDataApi } from '../utils/apis/tree'
 	import { pageConfig } from '../utils/apis/pageConfig'
+	import {onLoad} from '@dcloudio/uni-app'
 	defineOptions({
 		name: 'WTree',
 	})
+	const emits=defineEmits(["handleConfirm"])
 	const value = ref<string[]>([])
 	const sourceId = ref('')
 	const columns = ref<any[]>([])
@@ -18,19 +20,16 @@
 		branchTitle: "",
 		id: "",
 		rootGtmplId: '',
-		primaryColumnId: ""
+		primaryColumnId: "",
+		leafRatmplId:''
 	})
 	// 定义 props 类型
 	interface Props {
-	  sourceId: string
+	  sourceId?: string,
 	}
 
 	const props=defineProps<Props>()
-	onMounted(() => {
-		sourceId.value=props.sourceId
-		treeConfig1()
-	})
-
+	
 	//获取配置1
 	const treeConfig1 = async () => {
 		try {
@@ -39,11 +38,18 @@
 			treeConfigs.branchTitle = res.data.ttmplConfig.branchTitle
 			treeConfigs.id = res.data.ttmplConfig.id
 			treeConfigs.rootGtmplId = res.data.ttmplConfig.rootGtmplId
+			treeConfigs.leafRatmplId=res.data.ttmplConfig.leafRatmplId
 			treeConfig2(treeConfigs.branchRatmplId)
 		} catch (error) {
 			//TODO handle the exception
 		}
 	}
+	
+	onLoad((option:any) => {
+		
+		sourceId.value=props.sourceId||option.sourceId
+		treeConfig1()
+	})
 
 	//获取配置2
 	const treeConfig2 = async (sourceId : string) => {
@@ -95,12 +101,19 @@
 
 	}
 
-	function handleConfirm({ value }) {
-		console.log(value)
+	function handleConfirm(item:any) {
+		emits('handleConfirm',{
+			data:item,
+			leafRatmplId:treeConfigs.leafRatmplId
+		})
 	}
 	// 格式化方法
 	const displayFormat = (selectedItems: Record<string, any>[]) => {
-	  return selectedItems[selectedItems.length - 2].label + '/' + selectedItems[selectedItems.length - 1].label
+		if(selectedItems.length){
+			return selectedItems[selectedItems.length - 2].label + '/' + selectedItems[selectedItems.length - 1].label
+		}else{
+			
+		}
 	}
 </script>
 

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

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