合并李文轩代码

src/components/DesignForm/app/formPage.vue

@@ -97,7 +97,11 @@ const emits = defineEmits<{
 	(e: 'btnClick', type: string): void
 	(e: 'change', val: any): void // 表单组件值发生变化时
 	(e: 'update:issave', type: boolean): void
+<<<<<<< HEAD
 	(e: 'closePage', type: string): void
+=======
+	(e: 'optionsValue3Get3', val: any,fieldName: string): void 
+>>>>>>> lwx_v11
 }>()
 
 const route = useRoute()
@@ -1025,6 +1029,14 @@ defineExpose({
 	// getEditData,
 	// submitEdit
 })
+
+
+function optionsValue3Get2(data: any,fieldName: string){
+	
+	
+	emits('optionsValue3Get3',data,fieldName)
+	
+}
 </script>
 <template>
 	<div class="common-layout">
@@ -1067,7 +1079,7 @@ defineExpose({
 				}"
 			>
 
-				<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" />
+				<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" @optionsValue3Get2="optionsValue3Get2"/>
 				
 				<slot></slot>
 			</el-form>

src/components/DesignForm/assembly/index.ts

@@ -14,7 +14,7 @@ const selectOption: any = [
 	}*/
 ]
 const config: { optionsType: number } = {
-	optionsType: 0 // 0固定 1数据源 2 接口字典
+	optionsType: 0 // 0固定 1数据源 2 接口字典 3系统表单字段
 }
 export default [
 	{

src/components/DesignForm/formControlAttr.vue

@@ -1153,7 +1153,7 @@
         //liwenxuan 20240508 checkbox 删除选项时提醒  start
         let delflag = true
         let breakFlag = 0
-        if(controlData.value.type === 'checkbox'){
+        if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){
             for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
                 if(breakFlag>0){
                     break
@@ -2432,7 +2432,9 @@ watch(()=>controlData.value.control,(newVal) => {
 
 //radio,select添加选项时同步配置选项
 watch(()=>controlData.value.options, (changedOptions:any) => {
+    
         if(controlData.value.type === "radio" || controlData.value.type === "select"){
+            if(controlData.value.config.optionsType==0){
                 if(changedOptions.length===0){
                     //删没了option
                     controlData.value.control.glxxsz = []
@@ -2461,13 +2463,17 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
                         }
                     }
                 }
+            }
         }else if(controlData.value.type === "checkbox"){
             
         }
+    
+    
 },{ deep: true })
 
 
 function createRowForGlxxsz(){
+    if(controlData.value.config.optionsType==0){
         controlData.value.control.glxxszForCheckBox.push(
             {
                 conditionField: controlData.value.name,
@@ -2478,9 +2484,13 @@ function createRowForGlxxsz(){
         )
     }
     
+}
+
 function deleteRowForGlxxsz(row: { id: any }){
+    if(controlData.value.config.optionsType==0){
         controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
     }
+}
 /*  */
 
 const optionsValue3SettingDialogOpenFlag = ref(false)
@@ -2494,6 +2504,11 @@ function handleDetermineoptionsValue3(){
 
 
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
+function optionsTypeChanged(){
+    controlData.value.config.optionsFun = ''
+    controlData.value.options = []
+}
+
 
 
 
@@ -3118,13 +3133,13 @@ const disabledIstrue = (val:string) => {
                                 </el-form-item>
                             </div>
                         </div>
-                        <div v-if="showHide(['switch'],true)">
+                        <div v-if="showHide(['switch'],true)&&controlData.config.optionsType==0">
                             <el-button   @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
                         </div>
-                        <div v-if="showHide(['radio','select',],true)">
+                        <div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
                             <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
                         </div>
-                        <div v-if="showHide(['checkbox',],true)">
+                        <div v-if="showHide(['checkbox',],true)&&controlData.config.optionsType==0">
                             <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
                         </div>
                         <div
@@ -3153,7 +3168,7 @@ const disabledIstrue = (val:string) => {
                             <el-form-item label="选项数据源" class="form_cont">
                                 <el-select
                                     v-model="controlData.config.optionsType"
-                                    @change="controlData.config.optionsFun = ''"
+                                    @change="optionsTypeChanged"
                                 >
                                     <el-option :value="0" label="固定选项" />
                                     <el-option :value="3" label="系统表单字段"/>

src/components/DesignForm/formControlPropertiNew.vue

@@ -1194,7 +1194,7 @@ const delSelectOption = (index: number, type?: string) => {
         //liwenxuan 20240508 checkbox 删除选项时提醒  start
         let delflag = true
         let breakFlag = 0
-        if(controlData.value.type === 'checkbox'){
+        if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){
             for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
                 if(breakFlag>0){
                     break
@@ -2466,6 +2466,7 @@ watch(()=>controlData.value.control,(newVal) => {
 //radio,select添加选项时同步配置选项
 watch(()=>controlData.value.options, (changedOptions:any) => {
     if(controlData.value.type === "radio" || controlData.value.type === "select"){
+        if(controlData.value.config.optionsType==0){
             if(changedOptions.length===0){
                 //删没了option
                 controlData.value.control.glxxsz = []
@@ -2494,6 +2495,7 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
                     }
                 }
             }
+        }
     }else if(controlData.value.type === "checkbox"){
         
     }
@@ -2501,6 +2503,7 @@ watch(()=>controlData.value.options, (changedOptions:any) => {
 
 
 function createRowForGlxxsz(){
+    if(controlData.value.config.optionsType==0){
         controlData.value.control.glxxszForCheckBox.push(
             {
                 conditionField: controlData.value.name,
@@ -2510,10 +2513,13 @@ function createRowForGlxxsz(){
             }
         )
     }
+}
 
 function deleteRowForGlxxsz(row: { id: any }){
+    if(controlData.value.config.optionsType==0){
         controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id!=row.id)
     }
+}
 /*  */
 
 const optionsValue3SettingDialogOpenFlag = ref(false)
@@ -2529,6 +2535,13 @@ function handleDetermineoptionsValue3(){
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
 
+function optionsTypeChanged(){
+    controlData.value.config.optionsFun = ''
+    controlData.value.options = []
+}
+
+
+
 
 		
     const optionsCss = [
@@ -3150,13 +3163,13 @@ const disabledIstrue = (val:string) => {
                                 </el-form-item>
                             </div>
                         </div>
-                        <div v-if="showHide(['switch'],true)">
+                        <div v-if="showHide(['switch'],true)&&controlData.config.optionsType==0">
                             <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
                         </div>
-                        <div v-if="showHide(['radio','select',],true)">
+                        <div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
                             <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
                         </div>
-                        <div v-if="showHide(['checkbox',],true)">
+                        <div v-if="showHide(['checkbox',],true)&&controlData.config.optionsType==0">
                             <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
                         </div>
                         <div
@@ -3185,7 +3198,7 @@ const disabledIstrue = (val:string) => {
                             <el-form-item label="选项数据源" class="form_cont">
                                 <el-select
                                     v-model="controlData.config.optionsType"
-                                    @change="controlData.config.optionsFun = ''"
+                                    @change="optionsTypeChanged"
                                 >
                                     <el-option :value="0" label="固定选项" />
                                     <el-option :value="3" label="系统表单字段"/>

src/components/DesignForm/public/form/form.vue

@@ -84,6 +84,7 @@ const emits = defineEmits<{
 	(e: 'change', val: any): void // 表单组件值发生变化时
 	(e: 'update:issave', type: boolean): void
 	(e: 'refresh'): void
+	(e: 'optionsValue3Get3', val: any,fieldName: string): void 
 }>()
 const route = useRoute()
 const router = useRouter()
@@ -1587,6 +1588,10 @@ const submitEdit = (type: string, res: any) => {
     }
 }
 
+function optionsValue3Get2(data: any,fieldName: string){
+	emits('optionsValue3Get3',data,fieldName)
+}
+
 defineExpose({
     setOptions,
     setValue,
@@ -1616,7 +1621,7 @@ defineExpose({
 			}"
 		>
 
-			<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" />
+			<FormGroup :tableinfo="formData.form" :numrun="numrun" :data="formData.list" @optionsValue3Get2="optionsValue3Get2"/>
 			
 			<slot></slot>
 	  	</el-form>

src/components/DesignForm/public/form/formGroup.vue

@@ -35,6 +35,7 @@ const props = withDefaults(
     }
 )
 
+let emits = defineEmits(['optionsValue3Get2']);
 
 const store = useDesignFormStore() as any //自定义表单存储器
 const formProps = inject(constFormProps, {}) as any
@@ -377,7 +378,13 @@ const getFormItemLableStyle = (ele: any) => {
       return AnalysisCss(ele?.labelStyle)
     }
 }
+<<<<<<< HEAD
 
+=======
+function optionsValue3Get1(data: any,fieldName: string){
+	emits('optionsValue3Get2',data,fieldName)
+}
+>>>>>>> lwx_v11
 </script>
 <template>
 	<draggable
@@ -586,7 +593,7 @@ const getFormItemLableStyle = (ele: any) => {
 				<UrlLink v-else-if="element.type === 'urllink'" :data="element" />
 				<SerialNumber  v-else-if="element.type === 'serialNumber'" :data="element" :tablekey="props.tableinfo.name" :numrun="props.numrun" />
 				<!--其他组件-->
-				<FormItem v-else :data="element" />
+				<FormItem v-else :data="element" @optionsValue3Get1="optionsValue3Get1"/>
 				
 				<!--组件设计外功能框架-->
 				<template v-if="type === 5">

src/components/DesignForm/public/form/formItem.vue

@@ -37,6 +37,8 @@ import TextImg from "@/assets/image/tinymce.png"
 
 import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo.ts'
 
+import request from '@/utils/request';
+
 const props = withDefaults(
     defineProps<{
       data: FormList
@@ -47,6 +49,7 @@ const props = withDefaults(
 )
 const emits = defineEmits<{
     (e: 'update:modelValue', val: any): void
+	(e: 'optionsValue3Get1', val: any,fieldName: string): void
 }>()
 const route = useRoute()
 const formProps = inject(constFormProps, {}) as any
@@ -187,6 +190,7 @@ const itemRules = computed(() => {
 })
 // data 根据条件搜索，select远程搜索里data有值
 const getAxiosOptions = debounce((data?: any) => {
+	//console.log(props.data)
     const {
 		optionsType,
 		optionsFun,
@@ -277,10 +281,53 @@ const getAxiosOptions = debounce((data?: any) => {
 			// 		console.log(res)
 			// 	})
         	}
+    	}else if(optionsType === 3){//liwenxuan 20240611 系统表单字段效果实现
+			/*
+				在这里请求后台获取字段
+			*/
+			getFieldRecord(props.data.control.optionsValue3Field).then(({ data }) => {
+				//console.log(data)
+				//console.log(props.data.name)
+				let fieldName = props.data.name
+				//console.log(options.value)
+				//options.value = data
+				/*
+					
+					
+				*/
+				emits('optionsValue3Get1',data,fieldName)
+				//console.log(options.value)
+				//console.log()
+			})
+			
+			
 		}
       	setFormDict(formProps.value.dict) // 表格里新增时行时需要重新设一次
     }
 })
+watch(
+    () => props.data.control.optionsValue3Field,
+    () => {
+		getAxiosOptions() 
+    }
+)
+watch(
+    () => props.data.config.optionsType,
+    () => {
+		getAxiosOptions() 
+    }
+)
+
+
+function getFieldRecord(param1: any) {
+	return request({
+		url: '/javasys/lowCode/AssociatedForms/getFieldRecord',
+		method: 'post',
+		data: {
+			optionsValue3Field:param1
+		},
+	});
+}
 watch(
     () => formProps.value.model[sourceFunKey.value],
     () => {

src/types/components.d.ts

@@ -127,6 +127,7 @@ declare module '@vue/runtime-core' {
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
+<<<<<<< HEAD
     IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpDownload: typeof import('~icons/ep/download')['default']
@@ -137,6 +138,13 @@ declare module '@vue/runtime-core' {
     IEpPicture: typeof import('~icons/ep/picture')['default']
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpPosition: typeof import('~icons/ep/position')['default']
+=======
+    IEpDelete: typeof import('~icons/ep/delete')['default']
+    IEpEdit: typeof import('~icons/ep/edit')['default']
+    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+    IEpOperation: typeof import('~icons/ep/operation')['default']
+    IEpPlus: typeof import('~icons/ep/plus')['default']
+>>>>>>> lwx_v11
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']

src/views/sysworkflow/lowcodepage/appPage/appPageForm/openAppFormPage.vue

@@ -198,6 +198,17 @@ const gainAppFormPageInit = () =>{
 	}
 }
 
+function optionsValue3Get3(data: any,fieldName: string){
+	for(let i = 0; i < stateForm.formData.list.length; i++){
+		if(stateForm.formData.list[i].name==fieldName){
+			stateForm.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				stateForm.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
+
 defineExpose({
 	gainAppFormPageInit
 })
@@ -245,6 +256,7 @@ defineExpose({
 							:close-app-submit="closeAppSubmit"
 							:change-key-val="changeKeyVal"
 							:save-draft-page="saveDraftPage"
+							@optionsValue3Get3="optionsValue3Get3"
 						/>
 						
 					</el-scrollbar>

src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageForm.vue

@@ -501,6 +501,47 @@ const versionPreviewPage = (val:string) => {
 	}
 	
 }
+
+//liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
+const formNameChanged = (param1: any)=>{
+	for(let i = 0; i < state.value.formData.list.length; i++){
+		if(state.value.formData.list[i].type=="radio"||state.value.formData.list[i].type=="select"||state.value.formData.list[i].type=="checkbox"){
+			if(state.value.formData.list[i].control.glxxsz!=undefined&&state.value.formData.list[i].control.glxxsz.length>0){
+				state.value.formData.list[i].control.glxxsz = []
+				state.value.formData.list[i].options.push({
+					label: '',
+					value: ''
+                })
+				state.value.formData.list[i].options.pop();
+			}
+			if(state.value.formData.list[i].control.glxxszForCheckBox!=undefined&&state.value.formData.list[i].control.glxxszForCheckBox.length>0){
+				state.value.formData.list[i].control.glxxszForCheckBox = []
+			}
+		}
+	}
+	ElMessage({
+		message: '因字段标识改变，本表单的所有单选、多选、下拉的关联选项设置已重置，请重新设置。',
+		type: 'warning',
+	})
+}
+//liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
+
+function optionsValue3Get3(data: any,fieldName: string){
+	console.log(state.value.formData.list)
+	console.log(data)
+	console.log(fieldName)
+	for(let i = 0; i < state.value.formData.list.length; i++){
+		
+		if(state.value.formData.list[i].name==fieldName){
+			state.value.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				state.value.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
+
+
 </script>
 <template>
 	<el-aside class="asideBox leftBox">
@@ -529,6 +570,7 @@ const versionPreviewPage = (val:string) => {
 					:type="5"
 					:form-data="state.formData"
 					:dict="state.formDict"
+					@optionsValue3Get3="optionsValue3Get3"
 				/>
 		</div>
 	</el-main>
@@ -544,6 +586,7 @@ const versionPreviewPage = (val:string) => {
 			:is-edit="isEdit"
 			:form-field="formFieldAry"
 			@open-dialog="openAceEditDrawer"
+			@form-name-change="formNameChanged"
 		/>
 	</el-aside>
 	<ace-drawer

src/views/sysworkflow/lowcodepage/pageDesignes.vue

@@ -623,6 +623,21 @@ function refreshFunc(){
 	index.value = index.value+1
 }
 
+function optionsValue3Get3(data: any,fieldName: string){
+/* 	console.log(state.value.formData.list)
+	console.log(data)
+	console.log(fieldName) */
+	
+	for(let i = 0; i < state.value.formData.list.length; i++){
+		if(state.value.formData.list[i].name==fieldName){
+			state.value.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				state.value.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
+
 
 </script>
 <template>
@@ -649,6 +664,7 @@ function refreshFunc(){
 					:type="5"
 					:form-data="state.formData"
 					:dict="state.formDict"
+					@optionsValue3Get3="optionsValue3Get3"
 				/>
 			</div>
 		</div>

src/views/sysworkflow/lowcodepage/pageFlow/appTableFlow.vue

@@ -485,6 +485,18 @@ const initLoadData = () => {
 	}
 	
 }
+
+function optionsValue3Get3(data: any,fieldName: string){
+	
+	for(let i = 0; i < stateForm.formData.list.length; i++){
+		if(stateForm.formData.list[i].name==fieldName){
+			stateForm.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				stateForm.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
 </script>
 <template>
 	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
@@ -502,6 +514,7 @@ const initLoadData = () => {
 						:version-id="versionid"
 						:after-submit="afterSubmit"
 						add-url="addData"
+						@optionsValue3Get3="optionsValue3Get3"
 					/>
 	</el-drawer>
 	

src/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue

@@ -62,7 +62,7 @@ const state = reactive<any>({
     id: 0,
     loading: true
 })
-const emits = defineEmits(["update:isopen","searchquery"]);
+const emits = defineEmits(["update:isopen","searchquery","optionsValue3Get4"]);
 const drawerOpenOrClose =   computed({
 	get: () => props.isopen,
 	set: (val) => {
@@ -408,6 +408,18 @@ const saveDraftPage = (type: string,val?:any) => {
 	}
 	closeAppSubmit()
 }
+
+function optionsValue3Get3(data: any,fieldName: string){
+	for(let i = 0; i < state.formData.list.length; i++){
+		if(state.formData.list[i].name==fieldName){
+			state.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				state.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
+
 </script>
 <template>
 	<el-drawer  v-model="drawerOpenOrClose" v-loading="loadingData" :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="drawbox" class="drawerClass" >
@@ -452,6 +464,7 @@ const saveDraftPage = (type: string,val?:any) => {
 				:after-submit="afterSubmit"
 				:close-app-submit="closeAppSubmit"
 				:save-draft-page="saveDraftPage"
+				@optionsValue3Get3="optionsValue3Get3"
 			/>
 		</div>
 	</el-drawer>

src/views/sysworkflow/lowcodepage/runApp/runAppForm.vue

@@ -171,6 +171,18 @@ watch(() => props.pickAppMenu,(val:any) => {
 },{
     deep: true
 })
+
+function optionsValue3Get3(data: any,fieldName: string){
+	
+	for(let i = 0; i < stateForm.formData.list.length; i++){
+		if(stateForm.formData.list[i].name==fieldName){
+			stateForm.formData.list[i].options = []
+			for(let j = 0;j<data.length;j++){
+				stateForm.formData.list[i].options.push(data[j])
+			}
+		}
+	}
+}
 </script>
 <template>
 	<el-row>
@@ -204,6 +216,7 @@ watch(() => props.pickAppMenu,(val:any) => {
 						:sign-code="appInitData.signCode"
 						:version-id="appInitData.versionId"
 						add-url="addData"
+						@optionsValue3Get3="optionsValue3Get3"
 					/>
 
 				</el-card>