w-ui-v1 1.1.33 → 1.1.35

package/index.ts

@@ -17,6 +17,7 @@ import WReportTable from './w-report-table/w-report-table.vue'
 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 {menu} from './utils/apis/menu'
 import request from './utils/http'
 import nfc from './utils/nfc'
@@ -41,7 +42,8 @@ const coms: any[] = [
   WReportTable,
   WFormControlVue,
   WScanBindingSensor,
-  WUpdateVersion
+  WUpdateVersion,
+  WTree
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/utils/apis/tree.ts

@@ -0,0 +1,20 @@
+import request from '../http.js'
+// 树列表页面详细配置
+export function treeConfigApi(sourceId: string) {
+  return request({
+    url: `/v3/ttmpl/config?sourceId=${sourceId}`,
+  })
+}
+
+//树数据
+export function treeDataApi(sourceId: string) {
+  return request({
+    url: `/v3/ttmpl/root-data?sourceId=${sourceId}`,
+  })
+}
+//树节点数据
+export function treeNodeDataApi(sourceId: string,mainCode?:string) {
+  return request({
+    url: `/v3/ltmpl/top-data?sourceId=${sourceId}&mainCode=${mainCode}`,
+  })
+}

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

@@ -70,7 +70,7 @@
     <wd-cell v-else-if="(subItem.controlType === 'textarea'&&subItem.extControlType==='relselectvalue')||subItem.extControlType === '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"
+        <wSelectPicker  @confirm="wSelectPickerconfirm" :modelValue="modelValue" :disabled="subItem.disabled"
           :type="'checkbox'"
           :placeholder="subItem.disabled ? changeLanguageConmon('无需输入') : `${changeLanguageConmon('请输入')}${changeLanguageConmon(subItem.title)}`" :source-id="subItem.sourceId" filterable
           @clear="clear" clearable />
@@ -79,7 +79,7 @@
 	<wd-cell v-else-if="subItem.controlType === 'text'&&subItem.extControlType==='relselectvalue'" 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"
+	    <wSelectPicker  @confirm="wSelectPickerconfirm" :modelValue="modelValue" :disabled="subItem.disabled"
 	      :type="'checkbox'"
 	      :placeholder="subItem.disabled ? changeLanguageConmon('无需输入') : `${changeLanguageConmon('请输入')}${changeLanguageConmon(subItem.title)}`" :source-id="subItem.sourceId" filterable
 	      @clear="clear" clearable />
@@ -88,7 +88,7 @@
 	<wd-cell v-else-if="subItem.extControlType === 'relselect'" 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"
+	    <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 />

package/w-form-message-box/w-form-message-box.vue

@@ -1,23 +1,19 @@
 <template>
     <view>
         <wd-message-box selector="wd-message-box-slot" custom-class="wd-message-box-slot">
-            <wd-form ref="form" :model="model">
-                <wFromControl :subItem="subItem" v-for="(subItem,subIndex) in page.formItem" :key="subIndex" :model="model" :Enumcolumn="Enumcolumn"
-                    v-model:model-value="model[subItem.id]" />
-            </wd-form>
+			<view>
+				<wd-form ref="form" :model="model">
+				    <wFromControl :subItem="subItem" v-for="(subItem,subIndex) in page.formItem" :key="subIndex" :model="model" :Enumcolumn="Enumcolumn"
+				        v-model:model-value="model[subItem.id]" />
+				</wd-form>
+			</view>
+           
         </wd-message-box>
         <wd-toast />
     </view>
 </template>
 
-<script lang="ts">
-//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
-export default {
-  options: {
-    styleIsolation: 'shared'//使css :deep()生效
-  }
-}
-</script>
+
 <script setup lang="ts">
 import { changeLanguageConmon} from '../Locale'
 import wFromControl from '../w-form-control/w-form-control.vue'
@@ -119,7 +115,14 @@ defineExpose({
 
 <style scoped lang="scss">
 :deep(.wd-message-box-slot){
-    width: 95vw !important;
+    width: 100vw !important;
+}
+:deep(.wd-popup--center){
+	height: calc(100vh - 44px);
+	bottom: 0;
+	transform: translate3d(-50%, 0, 0) !important;
+	top:unset !important;
+	border-radius: 0;
 }
 :deep( .wd-message-box-slot .wd-message-box__flex){
    justify-content: space-between !important;

package/w-menu/w-menu.vue

@@ -1,31 +1,29 @@
-<script lang="ts">
-	//在自定义组件中使用 Wot Design Uni 组件时，需开启styleIsolation: 'shared'选项覆盖样式
-	export default {
-		options: {
-			styleIsolation: 'shared'//使css :deep()生效
-		}
-	}
-</script>
+
 <script setup lang="ts">
 	import { cloneDeep } from 'lodash-es'
 	import {
 		computed,
 		onMounted,
 		ref,
-		defineProps
+		defineProps,
+		PropType
 	} from 'vue'
 	import { menu } from '../utils/apis/menu'
     import { changeLanguageConmon} from '../Locale'
 	defineOptions({
 		name: 'WMenu',
 	})
+	interface Icon{
+		id:string
+		path:string
+	}
 	const props = defineProps({
 		icons: {
-			type: Array,
-			default: []
+			type: Array as PropType<Icon[]>,
+			default: ()=>[]
 		},
 		load:{
-			type: Function,
+			type: Function as PropType<()=>void>,
 			default: ()=>{}
 		}
 	})

package/w-select-picker/w-select-picker.vue

@@ -45,14 +45,14 @@
 						:min="min" :max="max" @change="handleChange">
 						<view v-for="item in filterColumns" :key="item[valueKey]" :id="'check' + item[valueKey]">
 							<wd-checkbox :modelValue="item[valueKey]" :disabled="item.disabled">
-								<text v-if="filterable && filterVal" style="white-space: pre-wrap;width: 600rpx;display: inline-block;">
+								<text v-if="filterable && filterVal" style="white-space: pre-wrap;width: 500rpx;display: inline-block;">
 									<block v-for="text in item[labelKey]" :key="text.label">
 										<text v-if="text.type === 'active'"
 											class="wd-select-picker__text-active" >{{ text.label }}</text>
 										<text v-else >{{ text.label }}</text>
 									</block>
 								</text>
-								<text v-else style="white-space: pre-wrap;width: 600rpx;display: inline-block;">
+								<text v-else style="white-space: pre-wrap;width: 500rpx;display: inline-block;">
 									{{ item[labelKey] }}
 								</text>
 							</wd-checkbox>

package/w-tree/w-tree.vue

@@ -0,0 +1,108 @@
+<template>
+	<wd-col-picker label="选择地址" 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 { treeConfigApi, treeDataApi,treeNodeDataApi } from '../utils/apis/tree'
+	import { pageConfig } from '../utils/apis/pageConfig'
+	defineOptions({
+		name: 'WTree',
+	})
+	const value = ref<string[]>([])
+	const sourceId = ref('')
+	const columns = ref<any[]>([])
+	const treeConfigs = reactive({
+		branchRatmplId: "",
+		branchTitle: "",
+		id: "",
+		rootGtmplId: '',
+		primaryColumnId: ""
+	})
+	// 定义 props 类型
+	interface Props {
+	  sourceId: string
+	}
+
+	const props=defineProps<Props>()
+	onMounted(() => {
+		sourceId.value=props.sourceId
+		treeConfig1()
+	})
+
+	//获取配置1
+	const treeConfig1 = async () => {
+		try {
+			const res = await treeConfigApi(sourceId.value)
+			treeConfigs.branchRatmplId = res.data.ttmplConfig.branchRatmplId
+			treeConfigs.branchTitle = res.data.ttmplConfig.branchTitle
+			treeConfigs.id = res.data.ttmplConfig.id
+			treeConfigs.rootGtmplId = res.data.ttmplConfig.rootGtmplId
+			treeConfig2(treeConfigs.branchRatmplId)
+		} catch (error) {
+			//TODO handle the exception
+		}
+	}
+
+	//获取配置2
+	const treeConfig2 = async (sourceId : string) => {
+		try {
+			const res = await pageConfig(sourceId)
+			treeConfigs.primaryColumnId = res.data.ltmplConfig.primaryColumn.sourceId
+			getTreeData(treeConfigs.branchRatmplId)
+		} catch (error) {
+			//TODO handle the exception
+		}
+	}
+
+	//获取数据
+	const getTreeData = async (sourceId : string) => {
+		try {
+			const res = await treeDataApi(sourceId)
+
+			columns.value = [res.data.entities.map((item : any) => {
+				return {
+					value: item.code,
+					label: item.fieldMap[treeConfigs.primaryColumnId]
+				}
+			})]
+		} catch (error) {
+			//TODO handle the exception
+		}
+	}
+
+	const columnChange = async ({ selectedItem, resolve, finish }) => {
+		try {
+			const res = await treeNodeDataApi(treeConfigs.branchRatmplId, selectedItem.value)
+			if(res.data.entities&&res.data.entities.length){
+				resolve(
+					res.data.entities.map((item : any) => {
+						return {
+							value: item.code,
+							label: item.fieldMap[treeConfigs.primaryColumnId]
+						}
+					})
+				)
+			}else{
+				finish()
+			}
+			
+		} catch (error) {
+			finish(false)
+			//TODO handle the exception
+		}
+
+	}
+
+	function handleConfirm({ value }) {
+		console.log(value)
+	}
+	// 格式化方法
+	const displayFormat = (selectedItems: Record<string, any>[]) => {
+	  return selectedItems[selectedItems.length - 2].label + '/' + selectedItems[selectedItems.length - 1].label
+	}
+</script>
+
+<style>
+</style>