From 57eaf3a4fe1460e615604b0f804c9f13755f8a9e Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Fri, 22 Nov 2024 16:19:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/favicon.ico                        |  Bin 0 -> 265278 bytes
 src/components/DesignForm/app/cardPage.vue    |  529 +-
 .../DesignForm/formControlPropertiNew.vue     | 9256 +++++++++--------
 .../DesignForm/public/form/childTable.vue     |  476 +-
 .../DesignForm/tableListPage/formPageCont.vue | 1031 +-
 .../DesignForm/tableListPage/index.vue        | 2483 ++---
 .../sysworkflow/lowcodepage/appCardPage.vue   |  905 +-
 src/views/sysworkflow/lowcodepage/index.vue   |  573 +-
 .../taskmanagement/lookFlowInfoApp.vue        |  438 +-
 ....timestamp-1731975545563-47f159282f4b9.mjs |  196 +
 10 files changed, 8477 insertions(+), 7410 deletions(-)
 create mode 100644 src/assets/favicon.ico
 create mode 100644 vite.config.ts.timestamp-1731975545563-47f159282f4b9.mjs

diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..726155913cb6e785a0ae2d421697bf62c5b4b665
GIT binary patch
literal 265278
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
Tf1OLdP^HU#(bd)edH?)>=IYN?

literal 0
HcmV?d00001

diff --git a/src/components/DesignForm/app/cardPage.vue b/src/components/DesignForm/app/cardPage.vue
index ff9dcfb..9261cd6 100644
--- a/src/components/DesignForm/app/cardPage.vue
+++ b/src/components/DesignForm/app/cardPage.vue
@@ -3,75 +3,75 @@
 @ 时间: 2024-07-17 15:35:39
 @ 备注: 卡片视图
 -->
-<script lang='ts' setup>
-import type { ComponentSize } from 'element-plus'
-import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
-import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
+<script lang="ts" setup>
+import type { ComponentSize } from "element-plus";
+import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
+import FormPageCont from "@/components/DesignForm/tableListPage/formPageCont.vue";
 
 const props = defineProps({
-	searchSend:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	viewSetup:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	columnsFilter:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	drawerWith:{
-		type:Number,
-		default:0
-	}
+  searchSend: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  viewSetup: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  columnsFilter: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
 });
-const size = ref<ComponentSize>('default')
-const lineRanks = ref(1)
+const size = ref<ComponentSize>("default");
+const lineRanks = ref(1);
 const imgBox = computed(() => {
-	let cssStyle:any = {}
-	if(props.viewSetup.form.imgWidth != 0){
-		cssStyle['width'] = props.viewSetup.form.imgWidth + "px";
-	}else{
-		cssStyle['width'] = "50px";
-	}
-	if(props.viewSetup.form.imgHeight != 0){
-		cssStyle['height'] = props.viewSetup.form.imgHeight + "px";
-	}else{
-		cssStyle['height'] = "50px";
-	}
-	
-	return  cssStyle
-})
+  let cssStyle: any = {};
+  if (props.viewSetup.form.imgWidth != 0) {
+    cssStyle["width"] = props.viewSetup.form.imgWidth + "px";
+  } else {
+    cssStyle["width"] = "50px";
+  }
+  if (props.viewSetup.form.imgHeight != 0) {
+    cssStyle["height"] = props.viewSetup.form.imgHeight + "px";
+  } else {
+    cssStyle["height"] = "50px";
+  }
+
+  return cssStyle;
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-18 14:26:46
 @ 功能: 图像设定Css
 */
 const imgStyle = computed(() => {
-	let cssStyle:any = {}
-	cssStyle['border'] = "1px solid #ccc";
-	cssStyle['border-radius'] = props.viewSetup.form.imgBorderRadius + "px";
-	cssStyle['padding'] = props.viewSetup.form.imgPadding + "px";
-	if(props.viewSetup.form.imgWidth != 0){
-		cssStyle['width'] = props.viewSetup.form.imgWidth + "px";
-	}else{
-		cssStyle['width'] = "50px";
-	}
-	if(props.viewSetup.form.imgHeight != 0){
-		cssStyle['height'] = props.viewSetup.form.imgHeight + "px";
-	}else{
-		cssStyle['height'] = "50px";
-	}
-	// console.log("自定义样式",cssStyle)
-	return  cssStyle
-})
+  let cssStyle: any = {};
+  cssStyle["border"] = "1px solid #ccc";
+  cssStyle["border-radius"] = props.viewSetup.form.imgBorderRadius + "px";
+  cssStyle["padding"] = props.viewSetup.form.imgPadding + "px";
+  if (props.viewSetup.form.imgWidth != 0) {
+    cssStyle["width"] = props.viewSetup.form.imgWidth + "px";
+  } else {
+    cssStyle["width"] = "50px";
+  }
+  if (props.viewSetup.form.imgHeight != 0) {
+    cssStyle["height"] = props.viewSetup.form.imgHeight + "px";
+  } else {
+    cssStyle["height"] = "50px";
+  }
+  // console.log("自定义样式",cssStyle)
+  return cssStyle;
+});
 
 /**
 @ 作者: 秦东
@@ -79,204 +79,222 @@ const imgStyle = computed(() => {
 @ 功能: 内容设定css
 */
 const cardInfoBox = computed(() => {
-	let cssStyle:any = {}
-	
-	cssStyle['width'] = (Math.round(24/props.viewSetup.form.ranks) - props.viewSetup.form.imgWidth) + "px";
-	return  cssStyle
-})
-onMounted(()=>{
-	lineRanks.value = Math.round(24/props.viewSetup.form.ranks)
-	nextTick(()=>{
-		getCardList(props.searchSend)
-	})
-})
+  let cssStyle: any = {};
+
+  cssStyle["width"] =
+    Math.round(24 / props.viewSetup.form.ranks) - props.viewSetup.form.imgWidth + "px";
+  return cssStyle;
+});
+onMounted(() => {
+  lineRanks.value = Math.round(24 / props.viewSetup.form.ranks);
+  nextTick(() => {
+    getCardList(props.searchSend);
+  });
+});
 // const url = ref()
 // const srcList = ref([])
 const handleSizeChange = (val: number) => {
-//   console.log(`${val} items per page`)\
-	props.searchSend.page = 1
-  	props.searchSend.pagesize = val
-//   console.log(props.searchSend.pagesize)
-	getCardList(props.searchSend)
-}
+  //   console.log(`${val} items per page`)\
+  props.searchSend.page = 1;
+  props.searchSend.pagesize = val;
+  //   console.log(props.searchSend.pagesize)
+  getCardList(props.searchSend);
+};
 const handleCurrentChange = (val: number) => {
-//   console.log(`current page: ${val}`)
-  props.searchSend.page = val
-  getCardList(props.searchSend)
-}
+  //   console.log(`current page: ${val}`)
+  props.searchSend.page = val;
+  getCardList(props.searchSend);
+};
 
-const url =
-  'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg'
-const srcList = (url:string) =>{
-	return [url]
-	return [
-		'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
-		'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
-		'https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg',
-		'https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg',
-		'https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg',
-		'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
-		'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
-	]
-} 
-const cardDataList = ref([]) // 表格行数据
-const totalNum = ref(0)
+const url = "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg";
+const srcList = (url: string) => {
+  return [url];
+  return [
+    "https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg",
+    "https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg",
+    "https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg",
+    "https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg",
+    "https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg",
+    "https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg",
+    "https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg",
+  ];
+};
+const cardDataList = ref([]); // 表格行数据
+const totalNum = ref(0);
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-19 09:32:11
 @ 功能: 获取数据
 */
-const getCardList = (val:any) => {
-	val.viewClass = {
-		class:"card"
-	}
-	gainFormPageListCont(val)
-		.then(({data})=>{
-			totalNum.value = data.total
-			// console.log("卡片获取数据--》",data)
-			cardDataList.value = data.list
-		})
-}
+const getCardList = (val: any) => {
+  val.viewClass = {
+    class: "card",
+  };
+  gainFormPageListCont(val).then(({ data }) => {
+    totalNum.value = data.total;
+    // console.log("卡片获取数据--》",data)
+    cardDataList.value = data.list;
+  });
+};
 defineExpose({
-	getCardList
-})
+  getCardList,
+});
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-19 10:03:53
 @ 功能: 获取图片显示
 */
-const imgSrcPath = (val:any) => {
-	// console.log("获取图片显示", val[props.viewSetup.form.imgWork])
-	if(val[props.viewSetup.form.imgWork]){
-		return val[props.viewSetup.form.imgWork]
-	}
-	return ""
-}
+const imgSrcPath = (val: any) => {
+  // console.log("获取图片显示", val[props.viewSetup.form.imgWork])
+  if (val[props.viewSetup.form.imgWork]) {
+    return val[props.viewSetup.form.imgWork];
+  }
+  return "";
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-19 10:03:53
 @ 功能: 获取图片数组显示
 */
-const imgSrcAry = (val:any) => {
-	if(val[props.viewSetup.form.imgWork]){
-		if (val[props.viewSetup.form.imgWork] != ""){
-			return [val[props.viewSetup.form.imgWork]]
-		}else{
-			return []
-		}
-		
-	}
-	return []
-}
+const imgSrcAry = (val: any) => {
+  if (val[props.viewSetup.form.imgWork]) {
+    if (val[props.viewSetup.form.imgWork] != "") {
+      return [val[props.viewSetup.form.imgWork]];
+    } else {
+      return [];
+    }
+  }
+  return [];
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-19 10:24:33
 @ 功能: 获取内容
 */
-const cardInfo = (val:any,cla:string) => {
-	if(cla=="title"){
-		if(props.viewSetup.form.title){
-			var titleAry = [];
-			if(props.viewSetup.form.title.length > 0){
-				props.viewSetup.form.title.forEach((item,index)=>{
-					// console.log("判断是否有标题--"+index+"-->",val[item])
-					if(val[item]){
-						titleAry.push(val[item])
-					}
-				})
-			}
-			if(titleAry.length>0){
-				return titleAry.join()
-			}else{
-				let firstWord = ""
-				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
-				for (let key in val) {
-					if (val.hasOwnProperty(key)) {
-						if(!powerAry.includes(key)){
-							if(val[key] != '' && val[key] != null){
-								firstWord = val[key]
-							}
-						}
-					}
-				}
-				return firstWord
-			}
-			
-		}
-		if(val[props.viewSetup.form.titleWork]){
-			return val[props.viewSetup.form.titleWork]
-		}
-	}else if(cla=="content"){
-		if(val[props.viewSetup.form.describe]){
-			return val[props.viewSetup.form.describe]
-		}
-	}
-	return ""
-}
+const cardInfo = (val: any, cla: string) => {
+  if (cla == "title") {
+    if (props.viewSetup.form.title) {
+      var titleAry = [];
+      if (props.viewSetup.form.title.length > 0) {
+        props.viewSetup.form.title.forEach((item, index) => {
+          // console.log("判断是否有标题--"+index+"-->",val[item])
+          if (val[item]) {
+            titleAry.push(val[item]);
+          }
+        });
+      }
+      if (titleAry.length > 0) {
+        return titleAry.join();
+      } else {
+        let firstWord = "";
+        let powerAry = [
+          "id",
+          "creater_time",
+          "edit_time",
+          "masters_key",
+          "states",
+          "flow_id",
+        ];
+        for (let key in val) {
+          if (val.hasOwnProperty(key)) {
+            if (!powerAry.includes(key)) {
+              if (val[key] != "" && val[key] != null) {
+                firstWord = val[key];
+              }
+            }
+          }
+        }
+        return firstWord;
+      }
+    }
+    if (val[props.viewSetup.form.titleWork]) {
+      return val[props.viewSetup.form.titleWork];
+    }
+  } else if (cla == "content") {
+    if (val[props.viewSetup.form.describe]) {
+      return val[props.viewSetup.form.describe];
+    }
+  }
+  return "";
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 13:24:06
 @ 功能: 查看详细内容
 */
-const tablePageClass = ref(1)
-const lookPageInfoIsShow = ref(false)
-const pageInfoCont = ref<any>()
-const lookPageInfo = (val:any) => {
-	tablePageClass.value = 4;
-	pageInfoCont.value = val
-	lookPageInfoIsShow.value = true;	
-}
+const tablePageClass = ref(1);
+const lookPageInfoIsShow = ref(false);
+const pageInfoCont = ref<any>();
+const lookPageInfo = (val: any) => {
+  tablePageClass.value = 4;
+  pageInfoCont.value = val;
+  lookPageInfoIsShow.value = true;
+};
 </script>
 <template>
-	<div>
-		<el-row :gutter="20">
-			
-			<el-col  v-for="item in cardDataList" :key="item.id" :span="lineRanks"  class="cardBox">
-				
-				<el-card @click="lookPageInfo(item)">
-					<div class="cardContBox">
-						<el-image
-							:style="imgStyle"
-							:src="imgSrcPath(item)"
-							:zoom-rate="1.2"
-							:max-scale="7"
-							:min-scale="0.2"
-							:preview-src-list="imgSrcAry(item)"
-							:initial-index="4"
-							fit="cover"
-						/>
-						<div class="cardInfo" :style="'width: calc(100% - '+props.viewSetup.form.imgWidth+'px); height:'+props.viewSetup.form.imgHeight+'px; overflow: hidden;' ">
-							<div class="title">{{ cardInfo(item,"title") }}</div>
-							<div class="content">{{ cardInfo(item,"content") }}</div>
-						</div>
-					</div>
-				</el-card>
-			
-			</el-col>
-			
-			
-			
-		</el-row>
-		<div class="pageBox">
-			<el-pagination
-				v-model:current-page="props.searchSend.page"
-				v-model:page-size="props.searchSend.pagesize"
-				:page-sizes="[3, 9, 12, 30, 50, 100]"
-				:size="size"
-				:background="true"
-				layout="total, sizes, prev, pager, next, jumper"
-				:total="totalNum"
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				class="page"
-			/>
-		</div>
-		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="props.drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
-	</div>
-	
+  <div>
+    <el-row :gutter="20">
+      <el-col
+        v-for="item in cardDataList"
+        :key="item.id"
+        :span="lineRanks"
+        class="cardBox"
+      >
+        <el-card @click="lookPageInfo(item)">
+          <div class="cardContBox">
+            <el-image
+              :style="imgStyle"
+              :src="imgSrcPath(item)"
+              :zoom-rate="1.2"
+              :max-scale="7"
+              :min-scale="0.2"
+              :preview-src-list="imgSrcAry(item)"
+              :initial-index="4"
+              fit="cover"
+            />
+            <div
+              class="cardInfo"
+              :style="
+                'width: calc(100% - ' +
+                props.viewSetup.form.imgWidth +
+                'px); height:' +
+                props.viewSetup.form.imgHeight +
+                'px; overflow: hidden;'
+              "
+            >
+              <div class="title">{{ cardInfo(item, "title") }}</div>
+              <div class="content">{{ cardInfo(item, "content") }}</div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <div class="pageBox">
+      <el-pagination
+        v-model:current-page="props.searchSend.page"
+        v-model:page-size="props.searchSend.pagesize"
+        :page-sizes="[3, 9, 12, 30, 50, 100]"
+        :size="size"
+        :background="true"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="totalNum"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        class="page"
+      />
+    </div>
+    <FormPageCont
+      v-model:is-show="lookPageInfoIsShow"
+      :drawer-with="props.drawerWith"
+      :page-info="pageInfoCont"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      @getPageData="getPageData"
+    />
+  </div>
 </template>
-<style  lang='scss' scoped>
+<style lang="scss" scoped>
 .demo-image__error .image-slot {
   font-size: 30px;
 }
@@ -287,40 +305,39 @@ const lookPageInfo = (val:any) => {
   width: 100%;
   height: 200px;
 }
-.cardBox{
-	padding: 10px 0 5px 0;
-	:deep .el-card__body{
-		padding:10px;
-	}
-	.title{
-		font-size:14px;
-		font-weight:bold;
-		display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-  text-overflow: ellipsis;
-	}
-	.content{
-		color: #909399;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-	.cardContBox{
-		display: flex;
-		width: 100%;
-		justify-content: flex-start;
-	}
-	.cardInfo{
-		padding-left: 5px;
-	}
-	
+.cardBox {
+  padding: 10px 0 5px 0;
+  :deep .el-card__body {
+    padding: 10px;
+  }
+  .title {
+    font-size: 14px;
+    font-weight: bold;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .content {
+    color: #909399;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .cardContBox {
+    display: flex;
+    width: 100%;
+    justify-content: flex-start;
+  }
+  .cardInfo {
+    padding-left: 5px;
+  }
 }
-.pageBox{
-	display:flex;
-	justify-content: center;
-	width: 100%;
-	text-align: center;
-	margin-top: 10px;
+.pageBox {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  text-align: center;
+  margin-top: 10px;
 }
 </style>
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 43c8fac..d989311 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -3,136 +3,134 @@
 @ 时间: 2024-06-13 08:43:17
 @ 备注: 表单控件（app）专用
 -->
-<script lang='ts' setup>
-import { reactive, computed, toRefs, ref, watch, inject } from 'vue'
-import { getRequest } from '@/api/DesignForm'
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import validate from './validate'
-import validateText from './validateText'
-import validateInt from './validateInt'
-import { ValidateTextTypes } from '@/components/DesignForm/validateText'
-import { ElMessage } from 'element-plus'
-import { formatNumber } from '@/api/DesignForm/utils'
-import { PublicAtrr } from '@/api/DesignForm/types'
-    
-import { chineseToPinyin,customerFormGroupList } from '@/api/DesignForm/requestapi'
-import request from '@/utils/request';
-    
-    //数学计算公式编辑器
-import MathFormula from '@/components/DesignForm/math/mathFormula.vue'
-    
-import { uploadUrl } from '@/api/DesignForm'
-import { UploadFilled } from '@element-plus/icons-vue'
-import { UploadFile, UploadFiles } from 'element-plus/es/components/upload/src/upload';
-import type Node from 'element-plus/es/components/tree/src/model/node'
-    //样式布局
-import LayoutPage from '@/components/DesignForm/layoutPage/index.vue'
-
-import { Plus } from '@element-plus/icons-vue'
-
-import Draggable from 'vuedraggable-es'
-
-
-	
-    
-    
-const props = withDefaults(			//接收父级参数
-        defineProps<{
-          	formData: any
-          	formList: any
-          	formConfig: any
-          	formOtherData: any
-          	customerformid: number | string,
-		  	formInfo: any,
-			isEdit: boolean,
-			formField: any[],
-        }>(),
-        {
-          formConfig: () => {
-            return {}
-          },
-		  isEdit: () =>{
-			return false;
-		  },
-		  formField: () =>{
-			return [];
-		  },
-          formOtherData: () => {
-            // 其他不需要保存在formData里的数据
-            return {}
-          }
-        }
-)
-const mathBoxShow = ref(false)
-    //注册自定义事件
+<script lang="ts" setup>
+import { reactive, computed, toRefs, ref, watch, inject } from "vue";
+import { getRequest } from "@/api/DesignForm";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import validate from "./validate";
+import validateText from "./validateText";
+import validateInt from "./validateInt";
+import { ValidateTextTypes } from "@/components/DesignForm/validateText";
+import { ElMessage } from "element-plus";
+import { formatNumber } from "@/api/DesignForm/utils";
+import { PublicAtrr } from "@/api/DesignForm/types";
+
+import { chineseToPinyin, customerFormGroupList } from "@/api/DesignForm/requestapi";
+import request from "@/utils/request";
+
+//数学计算公式编辑器
+import MathFormula from "@/components/DesignForm/math/mathFormula.vue";
+
+import { uploadUrl } from "@/api/DesignForm";
+import { UploadFilled } from "@element-plus/icons-vue";
+import { UploadFile, UploadFiles } from "element-plus/es/components/upload/src/upload";
+import type Node from "element-plus/es/components/tree/src/model/node";
+//样式布局
+import LayoutPage from "@/components/DesignForm/layoutPage/index.vue";
+
+import { Plus } from "@element-plus/icons-vue";
+
+import Draggable from "vuedraggable-es";
+
+const props = withDefaults(
+  //接收父级参数
+  defineProps<{
+    formData: any;
+    formList: any;
+    formConfig: any;
+    formOtherData: any;
+    customerformid: number | string;
+    formInfo: any;
+    isEdit: boolean;
+    formField: any[];
+  }>(),
+  {
+    formConfig: () => {
+      return {};
+    },
+    isEdit: () => {
+      return false;
+    },
+    formField: () => {
+      return [];
+    },
+    formOtherData: () => {
+      // 其他不需要保存在formData里的数据
+      return {};
+    },
+  }
+);
+const mathBoxShow = ref(false);
+//注册自定义事件
 const emits = defineEmits<{
-        (e: 'openDialog', data: any): void
-        (e: 'update:formOtherData', data: any): void
-        (e: 'videoMsgChange', data: VideoMsg): void
-        (e: 'formNameChange', data: any): void
-        //(e: 'update:formData', data: any): void
-        //(e: 'update:formConfig', data: any): void
-}>()
-const { formConfig, formData } = toRefs(props)
-const store = useDesignFormStore() as any
+  (e: "openDialog", data: any): void;
+  (e: "update:formOtherData", data: any): void;
+  (e: "videoMsgChange", data: VideoMsg): void;
+  (e: "formNameChange", data: any): void;
+  //(e: 'update:formData', data: any): void
+  //(e: 'update:formConfig', data: any): void
+}>();
+const { formConfig, formData } = toRefs(props);
+const store = useDesignFormStore() as any;
 const controlData = computed(() => {
-        // console.log("注册自定义事件----------------->",props.formInfo)
-        // console.log("注册自定义事件--------1--------->",store.controlAttr)
-		// console.log("注册自定义事件---------3-------->",controlData.value.customRules)
-        return store.controlAttr
-})
-    //获取组件样式Demo
+  // console.log("注册自定义事件----------------->",props.formInfo)
+  // console.log("注册自定义事件--------1--------->",store.controlAttr)
+  // console.log("注册自定义事件---------3-------->",controlData.value.customRules)
+  return store.controlAttr;
+});
+//获取组件样式Demo
 const controlDataStyls = computed(() => {
-        return store.controlAttr.styles
-})
-    
-const dataSourceOption = ref([])
-const designType = inject('formDesignType')
+  return store.controlAttr.styles;
+});
+
+const dataSourceOption = ref([]);
+const designType = inject("formDesignType");
 const state = reactive({
-        dataSourceList: [],
-        customRulesList: [
-            ...validate,
-            {
-                type: 'rules',
-                label: '自定义正则'
-            },
-            {
-                type: 'methods',
-                label: '自定义方法'
-            }
-        ], // 自定义校验规则
-        isSearch: designType === 'search',
-        tooltip: {
-            css: '当前表单应用页的样式，类似于.vue文件中的style scoped中的样式',
-            dict: '数据字典，用于匹配多选组、下拉选择等，提供动态获取Options接口字典数据，一般不设置，从接口dict获取。json格式："sex":{"0":"男","1":"女"}',
-            rules:
-                "可参考UI组件表单校验，<a href='https://element-plus.gitee.io/zh-CN/component/form.html#%E8%A1%A8%E5%8D%95%E6%A0%A1%E9%AA%8C' target='_blank' style='color:red'>详情点击</a>",
-            props: '可添加当前组件所有prop属性及事件方法'
-        },
-        tabsName: 'second',
-        numberRulesList:[
-            {
-                type: 'time',
-                label: '时间',
-                msg:'请选择时间格式'
-            },
-            {
-                type: 'text',
-                label: '自定义字符',
-                msg:'请输入自定义字符'
-            },
-            {
-                type: 'serialnumber',
-                label: '流水序号',
-                msg:'流水号起始值'
-            },
-            {
-                type: 'randomnumber',
-                label: '随机数',
-                msg:'请输入随机数位数'
-            }
-        ]
-})
+  dataSourceList: [],
+  customRulesList: [
+    ...validate,
+    {
+      type: "rules",
+      label: "自定义正则",
+    },
+    {
+      type: "methods",
+      label: "自定义方法",
+    },
+  ], // 自定义校验规则
+  isSearch: designType === "search",
+  tooltip: {
+    css: "当前表单应用页的样式，类似于.vue文件中的style scoped中的样式",
+    dict:
+      '数据字典，用于匹配多选组、下拉选择等，提供动态获取Options接口字典数据，一般不设置，从接口dict获取。json格式："sex":{"0":"男","1":"女"}',
+    rules:
+      "可参考UI组件表单校验，<a href='https://element-plus.gitee.io/zh-CN/component/form.html#%E8%A1%A8%E5%8D%95%E6%A0%A1%E9%AA%8C' target='_blank' style='color:red'>详情点击</a>",
+    props: "可添加当前组件所有prop属性及事件方法",
+  },
+  tabsName: "second",
+  numberRulesList: [
+    {
+      type: "time",
+      label: "时间",
+      msg: "请选择时间格式",
+    },
+    {
+      type: "text",
+      label: "自定义字符",
+      msg: "请输入自定义字符",
+    },
+    {
+      type: "serialnumber",
+      label: "流水序号",
+      msg: "流水号起始值",
+    },
+    {
+      type: "randomnumber",
+      label: "随机数",
+      msg: "请输入随机数位数",
+    },
+  ],
+});
 
 /**
 @ 作者: 秦东
@@ -140,94 +138,88 @@ const state = reactive({
 @ 功能: 必填
 */
 const ValidateText = reactive<ValidateTextTypes>({
-	type: 'required',
-	label: '必填',
-	regExp: /^\s*$/,
-	message: '必填项',
-	checkbox: false
-})
+  type: "required",
+  label: "必填",
+  regExp: /^\s*$/,
+  message: "必填项",
+  checkbox: false,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 08:41:02
 @ 功能: 单选校验
 */
-const radioVerify = reactive<ValidateTextTypes>({})
-
-
-const textUinrVerfy = reactive([
-	...validateText
-])
-const numberUinrVerfy = reactive([
-	...validateInt
-])
+const radioVerify = reactive<ValidateTextTypes>({});
 
+const textUinrVerfy = reactive([...validateText]);
+const numberUinrVerfy = reactive([...validateInt]);
 
 const formAttr = computed(() => {
-	const isSearch = state.isSearch
-        return [
-            {
-                label: '表单名称',
-                placeholder: '用于保存的表单名称',
-                value: props.formOtherData.formName,
-                key: 'formName',
-                hide: isSearch
-            },
-            {
-                label: '数据源',
-                placeholder: '请选择数据源',
-                value: formatNumber(props.formOtherData.source),
-                type: 'select',
-                options: dataSourceOption.value,
-                key: 'source',
-                hide: isSearch || !dataSourceOption.value?.length,
-                clearable: true
-            },
-            {
-                label: '表单标识',
-                value: formData.value.name,
-                placeholder: '表单唯一标识，可为空',
-                key: 'name',
-                hide: isSearch
-            }
-            // {
-            // 	label: '表单标签宽度',
-            // 	value: formData.value.labelWidth,
-            // 	placeholder: '表单label宽，如180px',
-            // 	key: 'labelWidth'
-            // },
-            // {
-            // 	label: '表单样式名称',
-            // 	value: formData.value.class,
-            // 	placeholder: '额外添加的表单class类名',
-            // 	key: 'class',
-            // 	type: 'select',
-            // 	options: [
-            // 		{ label: '无样式', value: '',name:'',id:'' },
-            // 		{ label: '每行两列', value: 'form-row-2',name:'',id:'' },
-            // 		{ label: '每行三列', value: 'form-row-3',name:'',id:'' },
-            // 		{ label: '每行四列', value: 'form-row-4',name:'',id:'' }
-            // 	],
-            // 	hide: isSearch,
-            // 	clearable: true
-            // },
-            // {
-            // 	label: '字段名后添加冒号',
-            // 	value: formData.value.showColon,
-            // 	key: 'showColon',
-            // 	type: 'switch'
-            // },
-            // {
-            // 	label: '组件尺寸',
-            // 	value: formData.value.size,
-            // 	type: 'select',
-            // 	key: 'size',
-            // 	options: [
-            // 		{ label: 'large', value: 'large',name:'',id:'' },
-            // 		{ label: 'default', value: 'default',name:'',id:'' },
-            // 		{ label: 'small', value: 'small',name:'',id:'' }
-            // 	]
-            // }
-            /*{
+  const isSearch = state.isSearch;
+  return [
+    {
+      label: "表单名称",
+      placeholder: "用于保存的表单名称",
+      value: props.formOtherData.formName,
+      key: "formName",
+      hide: isSearch,
+    },
+    {
+      label: "数据源",
+      placeholder: "请选择数据源",
+      value: formatNumber(props.formOtherData.source),
+      type: "select",
+      options: dataSourceOption.value,
+      key: "source",
+      hide: isSearch || !dataSourceOption.value?.length,
+      clearable: true,
+    },
+    {
+      label: "表单标识",
+      value: formData.value.name,
+      placeholder: "表单唯一标识，可为空",
+      key: "name",
+      hide: isSearch,
+    },
+    // {
+    // 	label: '表单标签宽度',
+    // 	value: formData.value.labelWidth,
+    // 	placeholder: '表单label宽，如180px',
+    // 	key: 'labelWidth'
+    // },
+    // {
+    // 	label: '表单样式名称',
+    // 	value: formData.value.class,
+    // 	placeholder: '额外添加的表单class类名',
+    // 	key: 'class',
+    // 	type: 'select',
+    // 	options: [
+    // 		{ label: '无样式', value: '',name:'',id:'' },
+    // 		{ label: '每行两列', value: 'form-row-2',name:'',id:'' },
+    // 		{ label: '每行三列', value: 'form-row-3',name:'',id:'' },
+    // 		{ label: '每行四列', value: 'form-row-4',name:'',id:'' }
+    // 	],
+    // 	hide: isSearch,
+    // 	clearable: true
+    // },
+    // {
+    // 	label: '字段名后添加冒号',
+    // 	value: formData.value.showColon,
+    // 	key: 'showColon',
+    // 	type: 'switch'
+    // },
+    // {
+    // 	label: '组件尺寸',
+    // 	value: formData.value.size,
+    // 	type: 'select',
+    // 	key: 'size',
+    // 	options: [
+    // 		{ label: 'large', value: 'large',name:'',id:'' },
+    // 		{ label: 'default', value: 'default',name:'',id:'' },
+    // 		{ label: 'small', value: 'small',name:'',id:'' }
+    // 	]
+    // }
+    /*{
                 label: '筛选条件展开/收起',
                 value: formConfig.value.expand,
                 type: 'switch',
@@ -235,535 +227,544 @@ const formAttr = computed(() => {
                 key: 'expand',
                 hide: !isSearch
             }*/
-        ]
-})
+  ];
+});
 const attrList = computed(() => {
-    // console.log("controlData.value-1-->",controlData.value)
-    if (Object.keys(controlData.value).length) {
-        const {
-            control = {},
-            type,
-            name,
-            config = {},
-            item = {},
-            attr = {},
-            selectvalue = "default",
-            mathFormula = {},
-			unitName
-        }: { control: any;type:any;name:any;item:any;attr:any; config: any,selectvalue:any,mathFormula:any,unitName:any } = controlData.value
-        // console.log("controlData.value--->",controlData.value)
-        // console.log("controlData.value-1-->",unitName)
-        let columnIndex = false // 是否显示序号列
-        if (type === 'table') {
-            // 表格时处理
-            const list = controlData.value && controlData.value.list
-            if (list && list.length > 0) {
-                columnIndex = list[0].type === 'index'
-            }
+  // console.log("controlData.value-1-->",controlData.value)
+  if (Object.keys(controlData.value).length) {
+    const {
+      control = {},
+      type,
+      name,
+      config = {},
+      item = {},
+      attr = {},
+      selectvalue = "default",
+      mathFormula = {},
+      unitName,
+    }: {
+      control: any;
+      type: any;
+      name: any;
+      item: any;
+      attr: any;
+      config: any;
+      selectvalue: any;
+      mathFormula: any;
+      unitName: any;
+    } = controlData.value;
+    // console.log("controlData.value--->",controlData.value)
+    // console.log("controlData.value-1-->",unitName)
+    let columnIndex = false; // 是否显示序号列
+    if (type === "table") {
+      // 表格时处理
+      const list = controlData.value && controlData.value.list;
+      if (list && list.length > 0) {
+        columnIndex = list[0].type === "index";
+      }
+    }
+    //判断校验规则
+    // console.log("判断校验规则--->",typeof(controlData.value.customRules))
+    if (typeof controlData.value.customRules == "object") {
+      if (Array.isArray(controlData.value.customRules)) {
+        let otherPick = [];
+        controlData.value.customRules.forEach((item: any) => {
+          // console.log("判断校验规则-1-->",item)
+          if (item.type == ValidateText.type) {
+            ValidateText.checkbox = true;
+          } else {
+            otherPick.push(item);
+          }
+        });
+        if (otherPick.length > 0) {
+          otherPick.forEach((item: any) => {
+            radioVerify.type = item.type;
+            radioVerify.label = item.label;
+            radioVerify.regExp = item.regExp;
+            radioVerify.message = item.message;
+            radioVerify.checkbox = true;
+          });
         }
-		//判断校验规则
-		// console.log("判断校验规则--->",typeof(controlData.value.customRules))
-		if(typeof(controlData.value.customRules)=="object"){
-			if(Array.isArray(controlData.value.customRules)){
-				let otherPick = []
-				controlData.value.customRules.forEach((item:any)=>{
-					// console.log("判断校验规则-1-->",item)
-					if(item.type == ValidateText.type){
-						ValidateText.checkbox = true
-					}else{
-						otherPick.push(item)
-					}
-				})
-				if(otherPick.length > 0){
-					otherPick.forEach((item:any)=>{
-						radioVerify.type = item.type
-						radioVerify.label = item.label
-						radioVerify.regExp = item.regExp
-						radioVerify.message = item.message
-						radioVerify.checkbox = true
-					});
-				}
-			}
-		}else{
-			ValidateText.checkbox = false
-			radioVerify.type = ""
-		}
-            
-        	const temp =reactive<PublicAtrr[]>([
-				{
-                    label: '标签名称',
-                    value: item.label,
-                    path: 'item.label',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'title',
-                        'gridChild',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ],
-                    eventName: 'labelNameVal'
-                },
-				{
-                    label: '组件类型',
-                    value: unitName,
-                    placeholder: '组件类型',
-                    path: 'unitName'
-                },
-                // {
-                //     label: '自定义Class',
-                //     value: config.className,
-                //     placeholder: '样式类名',
-                //     path: 'config.className'
-                // },
-                {
-                    label: '字段标识',
-                    value: name,
-                    type:
-                        Object.keys(state.dataSourceList).length > 0 ? 'select' : 'text',
-                    placeholder: '字段唯一标识，对应数据库',
-                    dict: state.dataSourceList,
-                    path: 'name',
-                    vHide: [
-                        'grid',
-                        'tabs',
-                        'card',
-                        'title',
-                        'gridChild',
-                        'tableColumn',
-                        'divider',
-                        'txt',
-                        'div',
-                        'button'
-                    ],
-                    eventName: 'filedNameKey'
-                },
-                {
-                    label: '占位内容',
-                    value: control.placeholder,
-                    placeholder: 'placeholder',
-                    path: 'control.placeholder',
-                    vShow: [
-                        'password',
-                        'input',
-                        'textarea',
-                        'select',
-                        'date',
-                        'number',
-                        'datePicker',
-                        'tinymce',
-                        'timePicker',
-                        'treeSelect',
-						'digitpage'
-                    ]
-                },
-				{
-                    label: '帮助信息',
-                    value: config.help,
-                    path: 'config.help',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'gridChild',
-                        'divider',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ]
-                },
-                {
-                    label: '按钮类型',
-                    value: control.type,
-                    path: 'control.type',
-                    type: 'select',
-                    dict: {
-                        primary: 'primary',
-                        success: 'success',
-                        info: 'info',
-                        warning: 'warning',
-                        danger: 'danger'
-                    },
-                    vShow: ['button'],
-                    clearable: true
-                },
-                {
-                    label: '按钮名称',
-                    value: control.label,
-                    path: 'control.label',
-                    vShow: ['button']
-                },
-                {
-                    label: '按钮事件',
-                    value: control.key,
-                    path: 'control.key',
-                    type: 'select',
-                    dict: {
-                        submit: '提交表单',
-                        reset: '重置表单',
-                        cancel: '取消返回',
-                        none: '无动作(自定义)'
-                    },
-                    vShow: ['button']
-                },
-                {
-                    label: '对齐方式',
-                    value: config.textAlign,
-                    path: 'config.textAlign',
-                    type: 'select',
-                    dict: {
-                        left: 'left',
-                        right: 'right',
-                        center: 'center'
-                    },
-                    vShow: ['button', 'div']
-                },
-                
-                {
-                    label: '隐藏标签',
-                    value: item.showLabel,
-                    path: 'item.showLabel',
-                    type: 'switch',
-                    vHide: [
-                        'table',
-                        'grid',
-                        'tabs',
-                        'title',
-                        'gridChild',
-                        'divider',
-                        'card',
-                        'div',
-                        'inputSlot',
-                        'flex',
-                        'button',
-                        'txt'
-                    ]
-                },
-                
-                {
-                    label: '表单栅格',
-                    value: config.span,
-                    placeholder: '表单区域栅格宽，0为自动宽',
-                    path: 'config.span',
-                    vHide: ['gridChild'],
-                    isNum: true
-                },
-                /*{
+      }
+    } else {
+      ValidateText.checkbox = false;
+      radioVerify.type = "";
+    }
+
+    const temp = reactive<PublicAtrr[]>([
+      {
+        label: "标签名称",
+        value: item.label,
+        path: "item.label",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "title",
+          "gridChild",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+        eventName: "labelNameVal",
+      },
+      {
+        label: "组件类型",
+        value: unitName,
+        placeholder: "组件类型",
+        path: "unitName",
+      },
+      // {
+      //     label: '自定义Class',
+      //     value: config.className,
+      //     placeholder: '样式类名',
+      //     path: 'config.className'
+      // },
+      {
+        label: "字段标识",
+        value: name,
+        type: Object.keys(state.dataSourceList).length > 0 ? "select" : "text",
+        placeholder: "字段唯一标识，对应数据库",
+        dict: state.dataSourceList,
+        path: "name",
+        vHide: [
+          "grid",
+          "tabs",
+          "card",
+          "title",
+          "gridChild",
+          "tableColumn",
+          "divider",
+          "txt",
+          "div",
+          "button",
+        ],
+        eventName: "filedNameKey",
+      },
+      {
+        label: "占位内容",
+        value: control.placeholder,
+        placeholder: "placeholder",
+        path: "control.placeholder",
+        vShow: [
+          "password",
+          "input",
+          "textarea",
+          "select",
+          "date",
+          "number",
+          "datePicker",
+          "tinymce",
+          "timePicker",
+          "treeSelect",
+          "digitpage",
+        ],
+      },
+      {
+        label: "帮助信息",
+        value: config.help,
+        path: "config.help",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "gridChild",
+          "divider",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+      },
+      {
+        label: "按钮类型",
+        value: control.type,
+        path: "control.type",
+        type: "select",
+        dict: {
+          primary: "primary",
+          success: "success",
+          info: "info",
+          warning: "warning",
+          danger: "danger",
+        },
+        vShow: ["button"],
+        clearable: true,
+      },
+      {
+        label: "按钮名称",
+        value: control.label,
+        path: "control.label",
+        vShow: ["button"],
+      },
+      {
+        label: "按钮事件",
+        value: control.key,
+        path: "control.key",
+        type: "select",
+        dict: {
+          submit: "提交表单",
+          reset: "重置表单",
+          cancel: "取消返回",
+          none: "无动作(自定义)",
+        },
+        vShow: ["button"],
+      },
+      {
+        label: "对齐方式",
+        value: config.textAlign,
+        path: "config.textAlign",
+        type: "select",
+        dict: {
+          left: "left",
+          right: "right",
+          center: "center",
+        },
+        vShow: ["button", "div"],
+      },
+
+      {
+        label: "隐藏标签",
+        value: item.showLabel,
+        path: "item.showLabel",
+        type: "switch",
+        vHide: [
+          "table",
+          "grid",
+          "tabs",
+          "title",
+          "gridChild",
+          "divider",
+          "card",
+          "div",
+          "inputSlot",
+          "flex",
+          "button",
+          "txt",
+        ],
+      },
+
+      {
+        label: "表单栅格",
+        value: config.span,
+        placeholder: "表单区域栅格宽，0为自动宽",
+        path: "config.span",
+        vHide: ["gridChild"],
+        isNum: true,
+      },
+      /*{
                 label: '行类样式',
                 value: config.inline,
                 type: 'switch',
                 path: 'config.inline',
                 vShow: ['div']
                 },*/
-                {
-                    label: '文本值',
-                    value: control.modelValue,
-                    placeholder: '支持html',
-                    path: 'control.modelValue',
-                    vShow: ['txt'],
-                    inputStyle: 'textarea'
-                },
-                {
-                    label: '设为密码',
-                    value: type,
-                    type: 'select',
-                    dict: { input: '文本', password: '密码' },
-                    path: 'type',
-                    vShow: ['input', 'password'],
-                    vIf: state.isSearch // 搜索模式下隐藏 为true
-                },
-                {
-                    label: '文本域高度',
-                    value: control.rows,
-                    placeholder: '输入框行数',
-                    path: 'control.rows',
-                    vShow: ['textarea'],
-                    isNum: true
-                },
-                {
-                    label: '前缀',
-                    value: config.prepend,
-                    placeholder: '文本前缀',
-                    path: 'config.prepend',
-                    vShow: ['input', 'password']
-                },
-                {
-                    label: '后缀',
-                    value: config.append,
-                    placeholder: '文本后缀',
-                    path: 'config.append',
-                    vShow: ['input', 'password']
-                },
-                // {
-                //     label: '状态打开时的值',
-                //     value: control.activeValue,
-                //     placeholder: '状态打开时的值',
-                //     path: 'control.activeValue',
-                //     vShow: ['switch'],
-                //     isNum: true
-                // },
-                // {
-                //     label: '状态关闭时的值',
-                //     value: control.inactiveValue,
-                //     placeholder: '状态关闭时的值',
-                //     path: 'control.inactiveValue',
-                //     vShow: ['switch'],
-                //     isNum: true
-                // },
-                // {
-                //   label: '转换格式化值',
-                //   value: config.transform,
-                //   path: 'config.transform',
-                //   type: 'switch',
-                //   vShow: [
-                //     'checkbox',
-                //     'select',
-                //     'switch',
-                //     'cascader',
-                //     'slider',
-                //     'table',
-                //     'flex',
-                //     'treeSelect'
-                //   ]
-                // },
-                {
-                    label: '增加按钮文案',
-                    value: config.addBtnText,
-                    path: 'config.addBtnText',
-                    type: 'text',
-                    vShow: ['flex', 'table']
-                },
-                {
-                    label: '删除按钮文案',
-                    value: config.delBtnText,
-                    path: 'config.delBtnText',
-                    type: 'text',
-                    vShow: ['flex', 'table']
-                },
-                {
-                    label: '是否多选',
-                    value: control.multiple,
-                    path: 'control.multiple',
-                    type: 'switch',
-                    vShow: ['select', 'treeSelect'],
-                    eventName: 'selectMultiple'
-                },
-                {
-                    label: '可清空',
-                    value: control.clearable,
-                    path: 'control.clearable',
-                    type: 'switch',
-                    vShow: ['select']
-                },
-                // {
-                //     label: '是否禁用',
-                //     value: control.disabled,
-                //     path: 'control.disabled',
-                //     type: 'switch',
-                //     vShow: [
-                //         'input',
-                //         'password',
-                //         'textarea',
-                //         'radio',
-                //         'checkbox',
-                //         'select',
-                //         'date',
-                //         'switch',
-                //         'number',
-                //         'cascader',
-                //         'upload',
-                //         'rate',
-                //         'tinymce',
-                //         'treeSelect'
-                //     ],
-                //     vIf: state.isSearch
-                // },
-                // {
-                //     label: '是否禁用编辑',
-                //     value: config.editDisabled,
-                //     path: 'config.editDisabled',
-                //     type: 'switch',
-                //     vShow: [
-                //         'input',
-                //         'password',
-                //         'textarea',
-                //         'radio',
-                //         'checkbox',
-                //         'select',
-                //         'date',
-                //         'switch',
-                //         'number',
-                //         'cascader',
-                //         'upload',
-                //         'treeSelect',
-                //         'table',
-                //         'flex'
-                //     ],
-                //     vIf: state.isSearch
-                // },
-                // {
-                //     label: '添加页隐藏',
-                //     value: config.disabledAdd,
-                //     path: 'config.disabledAdd',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                // {
-                //     label: '编辑页隐藏',
-                //     value: config.disabledEdit,
-                //     path: 'config.disabledEdit',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                // {
-                //     label: '详情页隐藏',
-                //     value: config.disabledDetail,
-                //     path: 'config.disabledDetail',
-                //     type: 'switch',
-                //     vIf: state.isSearch,
-                //     vHide: ['inputSlot']
-                // },
-                {
-                    label: '设为Input输入框的前/后缀',
-                    value: type === 'inputSlot',
-                    path: '',
-                    type: 'switch',
-                    vShow: ['select', 'inputSlot'],
-                    eventName: 'setInputSlot'
-                },
-                {
-                    label: '标题',
-                    value: control.modelValue,
-                    path: 'control.modelValue',
-                    vShow: ['title']
-                },
-                {
-                    label: '占据的列数span',
-                    value: attr.span,
-                    path: 'attr.span',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '左侧的间隔格数offset',
-                    value: attr.offset,
-                    path: 'attr.offset',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '向右移动格数push',
-                    value: attr.push,
-                    path: 'attr.push',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '向左移动格数pull',
-                    value: attr.pull,
-                    path: 'attr.pull',
-                    vShow: ['gridChild'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '序号列',
-                    value: columnIndex,
-                    type: 'switch',
-                    vShow: ['table'],
-                    eventName: 'tableColumn1'
-                },
-                /*{
+      {
+        label: "文本值",
+        value: control.modelValue,
+        placeholder: "支持html",
+        path: "control.modelValue",
+        vShow: ["txt"],
+        inputStyle: "textarea",
+      },
+      {
+        label: "设为密码",
+        value: type,
+        type: "select",
+        dict: { input: "文本", password: "密码" },
+        path: "type",
+        vShow: ["input", "password"],
+        vIf: state.isSearch, // 搜索模式下隐藏 为true
+      },
+      {
+        label: "文本域高度",
+        value: control.rows,
+        placeholder: "输入框行数",
+        path: "control.rows",
+        vShow: ["textarea"],
+        isNum: true,
+      },
+      {
+        label: "前缀",
+        value: config.prepend,
+        placeholder: "文本前缀",
+        path: "config.prepend",
+        vShow: ["input", "password"],
+      },
+      {
+        label: "后缀",
+        value: config.append,
+        placeholder: "文本后缀",
+        path: "config.append",
+        vShow: ["input", "password"],
+      },
+      // {
+      //     label: '状态打开时的值',
+      //     value: control.activeValue,
+      //     placeholder: '状态打开时的值',
+      //     path: 'control.activeValue',
+      //     vShow: ['switch'],
+      //     isNum: true
+      // },
+      // {
+      //     label: '状态关闭时的值',
+      //     value: control.inactiveValue,
+      //     placeholder: '状态关闭时的值',
+      //     path: 'control.inactiveValue',
+      //     vShow: ['switch'],
+      //     isNum: true
+      // },
+      // {
+      //   label: '转换格式化值',
+      //   value: config.transform,
+      //   path: 'config.transform',
+      //   type: 'switch',
+      //   vShow: [
+      //     'checkbox',
+      //     'select',
+      //     'switch',
+      //     'cascader',
+      //     'slider',
+      //     'table',
+      //     'flex',
+      //     'treeSelect'
+      //   ]
+      // },
+      {
+        label: "增加按钮文案",
+        value: config.addBtnText,
+        path: "config.addBtnText",
+        type: "text",
+        vShow: ["flex", "table"],
+      },
+      {
+        label: "删除按钮文案",
+        value: config.delBtnText,
+        path: "config.delBtnText",
+        type: "text",
+        vShow: ["flex", "table"],
+      },
+      {
+        label: "是否多选",
+        value: control.multiple,
+        path: "control.multiple",
+        type: "switch",
+        vShow: ["select", "treeSelect"],
+        eventName: "selectMultiple",
+      },
+      {
+        label: "可清空",
+        value: control.clearable,
+        path: "control.clearable",
+        type: "switch",
+        vShow: ["select"],
+      },
+      // {
+      //     label: '是否禁用',
+      //     value: control.disabled,
+      //     path: 'control.disabled',
+      //     type: 'switch',
+      //     vShow: [
+      //         'input',
+      //         'password',
+      //         'textarea',
+      //         'radio',
+      //         'checkbox',
+      //         'select',
+      //         'date',
+      //         'switch',
+      //         'number',
+      //         'cascader',
+      //         'upload',
+      //         'rate',
+      //         'tinymce',
+      //         'treeSelect'
+      //     ],
+      //     vIf: state.isSearch
+      // },
+      // {
+      //     label: '是否禁用编辑',
+      //     value: config.editDisabled,
+      //     path: 'config.editDisabled',
+      //     type: 'switch',
+      //     vShow: [
+      //         'input',
+      //         'password',
+      //         'textarea',
+      //         'radio',
+      //         'checkbox',
+      //         'select',
+      //         'date',
+      //         'switch',
+      //         'number',
+      //         'cascader',
+      //         'upload',
+      //         'treeSelect',
+      //         'table',
+      //         'flex'
+      //     ],
+      //     vIf: state.isSearch
+      // },
+      // {
+      //     label: '添加页隐藏',
+      //     value: config.disabledAdd,
+      //     path: 'config.disabledAdd',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      // {
+      //     label: '编辑页隐藏',
+      //     value: config.disabledEdit,
+      //     path: 'config.disabledEdit',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      // {
+      //     label: '详情页隐藏',
+      //     value: config.disabledDetail,
+      //     path: 'config.disabledDetail',
+      //     type: 'switch',
+      //     vIf: state.isSearch,
+      //     vHide: ['inputSlot']
+      // },
+      {
+        label: "设为Input输入框的前/后缀",
+        value: type === "inputSlot",
+        path: "",
+        type: "switch",
+        vShow: ["select", "inputSlot"],
+        eventName: "setInputSlot",
+      },
+      {
+        label: "标题",
+        value: control.modelValue,
+        path: "control.modelValue",
+        vShow: ["title"],
+      },
+      {
+        label: "占据的列数span",
+        value: attr.span,
+        path: "attr.span",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "左侧的间隔格数offset",
+        value: attr.offset,
+        path: "attr.offset",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "向右移动格数push",
+        value: attr.push,
+        path: "attr.push",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "向左移动格数pull",
+        value: attr.pull,
+        path: "attr.pull",
+        vShow: ["gridChild"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "序号列",
+        value: columnIndex,
+        type: "switch",
+        vShow: ["table"],
+        eventName: "tableColumn1",
+      },
+      /*{
                     label: '操作列',
                     value: columnOperate,
                     type: 'switch',
                     vShow: ['table'],
                     eventName: 'tableColumn2'
                 },*/
-                {
-                    label: '组件名',
-                    value: config.componentName,
-                    placeholder: '全局注册的组件名称',
-                    path: 'config.componentName',
-                    vShow: ['component']
-                },
-                {
-					label: '关联表单',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_form',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-				{
-					label: '隐藏条件',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_hide',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-					label: '数据范围',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_dataRange',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-					label: '数据填充规则',
-					value: config.associatedForms,
-					path: 'config.associatedForms',
-					type: 'associatedForms_FillRoles',
-					vIf: state.isSearch,
-					vShow: ['associatedForms']
-				},
-                {
-                    label: '轮播图设置',
-                    value: config.carousel,
-                    path: 'config.carousel',
-                    type: 'carousel',
-                    vIf: state.isSearch,
-                    vShow: ['lowcodeCarsusel']
-                },
-
-				{
-					label: '穿梭框名',
-					value: config.transfer,
-					path: 'config.transfer',
-					type: 'transfer_name',
-					vIf: state.isSearch,
-					vShow: ['lowcodeTransfer']
-				},
-				{
-					label: '选项数据源',
-					value: config.transfer,
-					path: 'config.transfer',
-					type: 'transfer_options_datasource',
-					vIf: state.isSearch,
-					vShow: ['lowcodeTransfer']
-				},
-                {
-                    label: '上传视频',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_url',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-				/* {
+      {
+        label: "组件名",
+        value: config.componentName,
+        placeholder: "全局注册的组件名称",
+        path: "config.componentName",
+        vShow: ["component"],
+      },
+      {
+        label: "关联表单",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_form",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "隐藏条件",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_hide",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "数据范围",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_dataRange",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "数据填充规则",
+        value: config.associatedForms,
+        path: "config.associatedForms",
+        type: "associatedForms_FillRoles",
+        vIf: state.isSearch,
+        vShow: ["associatedForms"],
+      },
+      {
+        label: "轮播图设置",
+        value: config.carousel,
+        path: "config.carousel",
+        type: "carousel",
+        vIf: state.isSearch,
+        vShow: ["lowcodeCarsusel"],
+      },
+
+      {
+        label: "穿梭框名",
+        value: config.transfer,
+        path: "config.transfer",
+        type: "transfer_name",
+        vIf: state.isSearch,
+        vShow: ["lowcodeTransfer"],
+      },
+      {
+        label: "选项数据源",
+        value: config.transfer,
+        path: "config.transfer",
+        type: "transfer_options_datasource",
+        vIf: state.isSearch,
+        vShow: ["lowcodeTransfer"],
+      },
+      {
+        label: "上传视频",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_url",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      /* {
 					label: '上传图片',
 					value: config.lowcodeImage,
 					path: 'config.lowcodeImage',
@@ -819,15 +820,15 @@ const attrList = computed(() => {
 					vIf: state.isSearch,
 					vShow: ['lowcodeImage']
 				}, */
-				// {
-				// 	label: '内外四边距',
-				// 	value: config.lowcodeImage,
-				// 	path: 'config.lowcodeImage',
-				// 	type: 'lowcodeImage_marginAndPadding',
-				// 	vIf: state.isSearch,
-				// 	vShow: ['lowcodeImage']
-				// },
-                /* {
+      // {
+      // 	label: '内外四边距',
+      // 	value: config.lowcodeImage,
+      // 	path: 'config.lowcodeImage',
+      // 	type: 'lowcodeImage_marginAndPadding',
+      // 	vIf: state.isSearch,
+      // 	vShow: ['lowcodeImage']
+      // },
+      /* {
                     label: '上传视频封面',
                     value: config.uploadvideo,
                     path: 'config.uploadvideo',
@@ -835,2411 +836,2486 @@ const attrList = computed(() => {
                     vIf: state.isSearch,
                     vShow: ['videoUpAndPlay']
                 }, */
-                {
-                    label: '视频宽度(像素)',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_width',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频高度(像素)',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_height',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频自动播放',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_autoPlay',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '视频循环播放',
-                    value: config.uploadvideo,
-                    path: 'config.uploadvideo',
-                    type: 'uploadvideo_loopPlay',
-                    vIf: state.isSearch,
-                    vShow: ['videoUpAndPlay']
-                },
-                {
-                    label: '上传地址',
-                    value: control.action,
-                    placeholder: '图片/文件上传地址,可不填有默认值',
-                    path: 'control.action',
-                    vShow: ['upload']
-                },
-                {
-                    label: '文件字段名',
-                    value: control.name,
-                    placeholder: '上传的文件字段名,默认file',
-                    path: 'control.name',
-                    vShow: ['upload']
-                },
-                {
-                    label: '列表类型',
-                    value: control.listType,
-                    type: 'select',
-                    dict: {
-                        text: 'text',
-                        picture: 'picture',
-                        'picture-card': 'picture-card'
-                    },
-                    path: 'control.listType',
-                    vShow: ['upload']
-                },
-                {
-                    label: '提示文字',
-                    value: config.tip,
-                    placeholder: '提示说明文字',
-                    path: 'config.tip',
-                    vShow: ['upload']
-                },
-                {
-                    label: '按钮文本',
-                    value: config.btnText,
-                    placeholder: '上传按钮文本',
-                    path: 'config.btnText',
-                    vShow: ['upload']
-                },
-                {
-                    label: '分割线方向',
-                    type: 'select',
-                    dict: { horizontal: 'horizontal', vertical: 'vertical' },
-                    placeholder: '分割线方向，默认horizontal',
-                    value: control.direction,
-                    path: 'control.direction',
-                    vShow: ['divider']
-                },
-                {
-                    label: '分隔符样式',
-                    placeholder: '分隔符样式，默认solid',
-                    value: control.borderStyle,
-                    path: 'control.borderStyle',
-                    vShow: ['divider']
-                },
-                {
-                    label: '文字方位',
-                    type: 'select',
-                    dict: { left: 'left', right: 'right', center: 'center' },
-                    value: control.contentPosition,
-                    path: 'control.contentPosition',
-                    vShow: ['divider']
-                },
-                {
-                    label: '最小值',
-                    value: control.min,
-                    path: 'control.min',
-                    vShow: ['slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '最大值',
-                    value: control.max,
-                    path: 'control.max',
-                    vShow: ['rate', 'slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '步长',
-                    value: control.step,
-                    path: 'control.step',
-                    vShow: ['slider'],
-                    eventName: 'formatNumber',
-                    isNum: true
-                },
-                {
-                    label: '显示类型',
-                    value: control.type,
-                    path: 'control.type',
-                    vShow: ['datePicker'],
-                    type: 'select',
-                    placeholder: '显示类型',
-                    dict: {
-                        year: '年',
-						month: '月',
-						date: '日期',
-						datetime: '日期+时间',
-						week: '周',
-						datetimerange: '开始日期时间至结束日期时间',
-						daterange: '开始日期至结束日期',
-						monthrange: '开始月至结束月'
-                    }
-                },
-                {
-                    label: '时间格式',
-                    value: control.format,
-                    path: 'control.format',
-                    vShow: ['datePicker', 'timePicker'],
-                    placeholder: '显示在输入框中的格式'
-                },
-                {
-                    label: 'color-format',
-                    value: control.colorFormat,
-                    path: 'control.colorFormat',
-                    type: 'select',
-                    placeholder: '写入 v-model 的颜色的格式',
-                    dict: { hsl: 'hsl', hsv: 'hsv', hex: 'hex', rgb: 'rgb' },
-                    vShow: ['colorPicker']
-                },
-                {
-                    label: '文本高度',
-                    value: control.height,
-                    path: 'control.height',
-                    placeholder: '文本高度(预览查看效果)',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '文本宽度',
-                    value: control.width,
-                    path: 'control.width',
-                    placeholder: '文本宽度(预览查看效果)',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '图片上传地址',
-                    value: control.imgUrl,
-                    path: 'control.imgUrl',
-                    placeholder: '图片上传地址',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '附件上传地址',
-                    value: control.blobUrl,
-                    path: 'control.blobUrl',
-                    placeholder: '附件上传地址',
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '显示模式',
-                    value: config.style,
-                    path: 'config.style',
-                    placeholder: '显示风格(预览查看效果)',
-                    type: 'select',
-                    dict: { default: 'default', simple: 'simple' },
-                    vShow: ['tinymce']
-                },
-                {
-                    label: '默认值',
-                    value: control.mathsValue,
-                    selectvalue: selectvalue,
-                    path: 'control.mathsValue',
-                    placeholder: '显示风格(预览查看效果)',
-                    type: 'digitpage',
-                    dict: { default: '自定义', simple: '编辑公式' },
-                    vShow: ['digitpage'],
-                    control:control
-                }
-        ])
-            // 过滤显示对应的值
-        return temp.filter((item: any) => {
-			// console.log("过滤显示对应的值--->",item)
-			// console.log("过滤显示对应的值-1-->",type)
-                let hasFilter = true
-                if (item.vShow) {
-                    hasFilter = item.vShow.includes(type)
-                }
-                if (item.vHide) {
-                    hasFilter = !item.vHide.includes(type)
-                }
-                if (item.vIf) {
-                // 不显示vif＝true的
-                    hasFilter = false
-                }
-                return hasFilter
-        })
-    } else {
-    	return []
-    }
-})
+      {
+        label: "视频宽度(像素)",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_width",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频高度(像素)",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_height",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频自动播放",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_autoPlay",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "视频循环播放",
+        value: config.uploadvideo,
+        path: "config.uploadvideo",
+        type: "uploadvideo_loopPlay",
+        vIf: state.isSearch,
+        vShow: ["videoUpAndPlay"],
+      },
+      {
+        label: "上传地址",
+        value: control.action,
+        placeholder: "图片/文件上传地址,可不填有默认值",
+        path: "control.action",
+        vShow: ["upload"],
+      },
+      {
+        label: "文件字段名",
+        value: control.name,
+        placeholder: "上传的文件字段名,默认file",
+        path: "control.name",
+        vShow: ["upload"],
+      },
+      {
+        label: "列表类型",
+        value: control.listType,
+        type: "select",
+        dict: {
+          text: "text",
+          picture: "picture",
+          "picture-card": "picture-card",
+        },
+        path: "control.listType",
+        vShow: ["upload"],
+      },
+      {
+        label: "提示文字",
+        value: config.tip,
+        placeholder: "提示说明文字",
+        path: "config.tip",
+        vShow: ["upload"],
+      },
+      {
+        label: "按钮文本",
+        value: config.btnText,
+        placeholder: "上传按钮文本",
+        path: "config.btnText",
+        vShow: ["upload"],
+      },
+      {
+        label: "分割线方向",
+        type: "select",
+        dict: { horizontal: "horizontal", vertical: "vertical" },
+        placeholder: "分割线方向，默认horizontal",
+        value: control.direction,
+        path: "control.direction",
+        vShow: ["divider"],
+      },
+      {
+        label: "分隔符样式",
+        placeholder: "分隔符样式，默认solid",
+        value: control.borderStyle,
+        path: "control.borderStyle",
+        vShow: ["divider"],
+      },
+      {
+        label: "文字方位",
+        type: "select",
+        dict: { left: "left", right: "right", center: "center" },
+        value: control.contentPosition,
+        path: "control.contentPosition",
+        vShow: ["divider"],
+      },
+      {
+        label: "最小值",
+        value: control.min,
+        path: "control.min",
+        vShow: ["slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "最大值",
+        value: control.max,
+        path: "control.max",
+        vShow: ["rate", "slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "步长",
+        value: control.step,
+        path: "control.step",
+        vShow: ["slider"],
+        eventName: "formatNumber",
+        isNum: true,
+      },
+      {
+        label: "显示类型",
+        value: control.type,
+        path: "control.type",
+        vShow: ["datePicker"],
+        type: "select",
+        placeholder: "显示类型",
+        dict: {
+          year: "年",
+          month: "月",
+          date: "日期",
+          datetime: "日期+时间",
+          week: "周",
+          datetimerange: "开始日期时间至结束日期时间",
+          daterange: "开始日期至结束日期",
+          monthrange: "开始月至结束月",
+        },
+      },
+      {
+        label: "时间格式",
+        value: control.format,
+        path: "control.format",
+        vShow: ["datePicker", "timePicker"],
+        placeholder: "显示在输入框中的格式",
+      },
+      {
+        label: "color-format",
+        value: control.colorFormat,
+        path: "control.colorFormat",
+        type: "select",
+        placeholder: "写入 v-model 的颜色的格式",
+        dict: { hsl: "hsl", hsv: "hsv", hex: "hex", rgb: "rgb" },
+        vShow: ["colorPicker"],
+      },
+      {
+        label: "文本高度",
+        value: control.height,
+        path: "control.height",
+        placeholder: "文本高度(预览查看效果)",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "文本宽度",
+        value: control.width,
+        path: "control.width",
+        placeholder: "文本宽度(预览查看效果)",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "图片上传地址",
+        value: control.imgUrl,
+        path: "control.imgUrl",
+        placeholder: "图片上传地址",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "附件上传地址",
+        value: control.blobUrl,
+        path: "control.blobUrl",
+        placeholder: "附件上传地址",
+        vShow: ["tinymce"],
+      },
+      {
+        label: "显示模式",
+        value: config.style,
+        path: "config.style",
+        placeholder: "显示风格(预览查看效果)",
+        type: "select",
+        dict: { default: "default", simple: "simple" },
+        vShow: ["tinymce"],
+      },
+      {
+        label: "默认值",
+        value: control.mathsValue,
+        selectvalue: selectvalue,
+        path: "control.mathsValue",
+        placeholder: "显示风格(预览查看效果)",
+        type: "digitpage",
+        dict: { default: "自定义", simple: "编辑公式" },
+        vShow: ["digitpage"],
+        control: control,
+      },
+    ]);
+    // 过滤显示对应的值
+    return temp.filter((item: any) => {
+      // console.log("过滤显示对应的值--->",item)
+      // console.log("过滤显示对应的值-1-->",type)
+      let hasFilter = true;
+      if (item.vShow) {
+        hasFilter = item.vShow.includes(type);
+      }
+      if (item.vHide) {
+        hasFilter = !item.vHide.includes(type);
+      }
+      if (item.vIf) {
+        // 不显示vif＝true的
+        hasFilter = false;
+      }
+      return hasFilter;
+    });
+  } else {
+    return [];
+  }
+});
 
 watch(
-    () => store.activeKey,
-    (val: string) => {
-        if (val) {
-            // 有值时自动跳到第一项
-            state.tabsName = 'first'
-            cssIsShouw(attrList)
-        }
+  () => store.activeKey,
+  (val: string) => {
+    if (val) {
+      // 有值时自动跳到第一项
+      state.tabsName = "first";
+      cssIsShouw(attrList);
     }
-)
-    
-const fileSignAry = reactive<any>([])
+  }
+);
+
+const fileSignAry = reactive<any>([]);
 const controlChange = (obj: any, val: any) => {
-        
-        // console.log("字段编辑--1--》",obj)
-        // console.log("字段编辑--2--》",obj.eventName)
-        // console.log("字段编辑--3--》",val)
-        // console.log("字段编辑--4--》",controlData.value)
-        // console.log("字段编辑--5--》",obj.path)
-        
-        // select多选属性，
-        switch (obj.eventName) {
-            case 'selectMultiple':
-                if (val) {
-                    // 多选，将值改为数组
-                    controlData.value.control.modelValue = []
-                } else {
-                    // 单选
-                    controlData.value.control.modelValue = ''
-                }
-                break
-            case 'tableColumn1':
-                tableColumnAdd(val)
-                break
-            case 'formatNumber':
-                val = parseInt(val) // 将值转数值
-                break
-            case 'filedNameKey':
-                // 选择字段标识时，同时修改显示标题
-                // 根据value找key
-                if (obj.type === 'select') {
-                    state.dataSourceList.forEach((item: any) => {
-                        if (item.name === val) {
-                            if (controlData.value.item) {
-                                controlData.value.item.label = item.label
-                            }
-                            controlData.value.name = item.label
-                        }
-                    })
-                }
-                break
-            case 'setInputSlot':
-                if (val) {
-                    // 将类型改为inputSlot
-                    controlData.value.type = 'inputSlot'
-                    ElMessage.success(
-                        `请在对应的Input输入框属性前后缀设置key:${controlData.value.name}`
-                    )
+  // console.log("字段编辑--1--》",obj)
+  // console.log("字段编辑--2--》",obj.eventName)
+  // console.log("字段编辑--3--》",val)
+  // console.log("字段编辑--4--》",controlData.value)
+  // console.log("字段编辑--5--》",obj.path)
+
+  // select多选属性，
+  switch (obj.eventName) {
+    case "selectMultiple":
+      if (val) {
+        // 多选，将值改为数组
+        controlData.value.control.modelValue = [];
+      } else {
+        // 单选
+        controlData.value.control.modelValue = "";
+      }
+      break;
+    case "tableColumn1":
+      tableColumnAdd(val);
+      break;
+    case "formatNumber":
+      val = parseInt(val); // 将值转数值
+      break;
+    case "filedNameKey":
+      // 选择字段标识时，同时修改显示标题
+      // 根据value找key
+      if (obj.type === "select") {
+        state.dataSourceList.forEach((item: any) => {
+          if (item.name === val) {
+            if (controlData.value.item) {
+              controlData.value.item.label = item.label;
+            }
+            controlData.value.name = item.label;
+          }
+        });
+      }
+      break;
+    case "setInputSlot":
+      if (val) {
+        // 将类型改为inputSlot
+        controlData.value.type = "inputSlot";
+        ElMessage.success(
+          `请在对应的Input输入框属性前后缀设置key:${controlData.value.name}`
+        );
+      } else {
+        controlData.value.type = "select";
+      }
+      // 这里会报错Cannot set properties of null (setting 'checked')
+      // 因value:type===inputSlot，这里使用了v-model，影响不大暂不处理
+      break;
+    case "labelNameVal":
+      if (val != "") {
+        let ary = ["founder", "founderTime", "editTime", "owner", "deptOrg"];
+        if (!ary.includes(controlData.value.type)) {
+          if (
+            Array.isArray(props.formField) &&
+            !props.formField.includes(controlData.value.name)
+          ) {
+            chineseToPinyin({
+              title: val,
+              types: 8,
+              connector: "",
+              formJson: JSON.stringify(props.formInfo),
+            }).then((data: any) => {
+              if (data.code == 0) {
+                if (data.data != "") {
+                  if (!fileSignAry.includes(data.data)) {
+                    controlData.value.name = data.data;
+                    fileSignAry.push(data.data);
+                  } else {
+                    let isEnd = true;
+                    do {
+                      let titleVal = data.data + Rand(10000000, 99999999);
+                      if (!fileSignAry.includes(titleVal)) {
+                        controlData.value.name = titleVal;
+                        fileSignAry.push(titleVal);
+                        isEnd = false;
+                      }
+                    } while (isEnd);
+                  }
                 } else {
-                    controlData.value.type = 'select'
-                }
-                // 这里会报错Cannot set properties of null (setting 'checked')
-                // 因value:type===inputSlot，这里使用了v-model，影响不大暂不处理
-                break
-            case 'labelNameVal':
-                if(val != ""){
-					let ary = ["founder","founderTime","editTime","owner","deptOrg"]
-					if (!ary.includes(controlData.value.type)){
-						if(Array.isArray(props.formField) && !props.formField.includes(controlData.value.name)){
-							chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
-								.then((data:any)=>{
-									if(data.code == 0){
-										if(data.data != ""){
-											if(!fileSignAry.includes(data.data)){
-												controlData.value.name = data.data
-												fileSignAry.push(data.data)
-											}else{
-												let isEnd = true;
-												do{
-													let titleVal = data.data + Rand(10000000,99999999)
-													if(!fileSignAry.includes(titleVal)){
-														controlData.value.name = titleVal;
-														fileSignAry.push(titleVal);
-														isEnd=false;
-													}
-												}while(isEnd);
-											}
-										}else{
-											if(!fileSignAry.includes(val)){
-												controlData.value.name = val 
-												fileSignAry.push(val)
-											}else{
-												let titleVal = val + Rand(10000000,99999999)
-												if(!fileSignAry.includes(titleVal)){
-													controlData.value.name = titleVal;
-													fileSignAry.push(titleVal);
-												}
-											}
-											
-										}
-										
-									}
-								})
-						}
-					}
-                	// chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
-                    // .then((data:any)=>{
-                    //     if(data.code == 0){
-                    //         if(data.data != ""){
-                    //             if(!fileSignAry.includes(data.data)){
-                    //                 controlData.value.name = data.data
-                    //                 fileSignAry.push(data.data)
-                    //             }else{
-                    //                 let isEnd = true;
-                    //                 do{
-                    //                     let titleVal = data.data + Rand(10000000,99999999)
-                    //                     if(!fileSignAry.includes(titleVal)){
-                    //                         controlData.value.name = titleVal;
-                    //                         fileSignAry.push(titleVal);
-                    //                         isEnd=false;
-                    //                     }
-                    //                 }while(isEnd);
-                    //             }
-                    //         }else{
-                    //             if(!fileSignAry.includes(val)){
-                    //                 controlData.value.name = val 
-                    //                 fileSignAry.push(val)
-                    //             }else{
-                    //                 let titleVal = val + Rand(10000000,99999999)
-                    //                 if(!fileSignAry.includes(titleVal)){
-                    //                     controlData.value.name = titleVal;
-                    //                     fileSignAry.push(titleVal);
-                    //                 }
-                    //             }
-                                
-                    //         }
-                            
-                    //     }
-                    // })
+                  if (!fileSignAry.includes(val)) {
+                    controlData.value.name = val;
+                    fileSignAry.push(val);
+                  } else {
+                    let titleVal = val + Rand(10000000, 99999999);
+                    if (!fileSignAry.includes(titleVal)) {
+                      controlData.value.name = titleVal;
+                      fileSignAry.push(titleVal);
+                    }
+                  }
                 }
-                
-                // console.log("字段编辑--fileSignAry--》",fileSignAry)
-                break
-        }
-        if (obj.path) {
-        const newVal = obj.isNum ? formatNumber(val) : val // 类型为数字时转整数
-            obj.path && getPropByPath(controlData.value, obj.path, newVal)
+              }
+            });
+          }
         }
+        // chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)})
+        // .then((data:any)=>{
+        //     if(data.code == 0){
+        //         if(data.data != ""){
+        //             if(!fileSignAry.includes(data.data)){
+        //                 controlData.value.name = data.data
+        //                 fileSignAry.push(data.data)
+        //             }else{
+        //                 let isEnd = true;
+        //                 do{
+        //                     let titleVal = data.data + Rand(10000000,99999999)
+        //                     if(!fileSignAry.includes(titleVal)){
+        //                         controlData.value.name = titleVal;
+        //                         fileSignAry.push(titleVal);
+        //                         isEnd=false;
+        //                     }
+        //                 }while(isEnd);
+        //             }
+        //         }else{
+        //             if(!fileSignAry.includes(val)){
+        //                 controlData.value.name = val
+        //                 fileSignAry.push(val)
+        //             }else{
+        //                 let titleVal = val + Rand(10000000,99999999)
+        //                 if(!fileSignAry.includes(titleVal)){
+        //                     controlData.value.name = titleVal;
+        //                     fileSignAry.push(titleVal);
+        //                 }
+        //             }
+
+        //         }
+
+        //     }
+        // })
+      }
+
+      // console.log("字段编辑--fileSignAry--》",fileSignAry)
+      break;
+  }
+  if (obj.path) {
+    const newVal = obj.isNum ? formatNumber(val) : val; // 类型为数字时转整数
+    obj.path && getPropByPath(controlData.value, obj.path, newVal);
+  }
 
+  //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
 
-        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  start
-
-        emits('formNameChange',val);
-        //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
-
-    }
+  emits("formNameChange", val);
+  //liwenxuan		关联选项设置	修复bug:当字段标识改变时，关联选项设置的字段标识未同步更改  end
+};
 
-    /** 
-    * 获取非负整数随机数 
-    * @param Min 最小整数  
-    * @param Max 最大整数 
-    * @returns 随机数 
-    */
+/**
+ * 获取非负整数随机数
+ * @param Min 最小整数
+ * @param Max 最大整数
+ * @returns 随机数
+ */
 const Rand = (Min: number, Max: number) => {
-        switch (Min) {
-            case 0: return Math.round(Math.random() * Max);
-            case 1: return Math.ceil(Math.random() * Max);
-            default: return Math.round(Math.random() * (Max - Min) + Min);
-        }
-    }
-    // 修改指定路径下的值
+  switch (Min) {
+    case 0:
+      return Math.round(Math.random() * Max);
+    case 1:
+      return Math.ceil(Math.random() * Max);
+    default:
+      return Math.round(Math.random() * (Max - Min) + Min);
+  }
+};
+// 修改指定路径下的值
 const getPropByPath = (obj: any, path: string, val: any) => {
-        let tempObj = obj
-    const keyArr = path.split('.')
-        let i = 0
-        for (i; i < keyArr.length - 1; i++) {
-        const key = keyArr[i]
-            if (key in tempObj) {
-                tempObj = tempObj[key]
-            } else {
-                throw new Error(`${key} is undefined`)
-                // break
-            }
-        }
-    const key = keyArr[i]
-    const value = tempObj[keyArr[i]]
-        // 检查最后一级是否存在
-        /*if (!(key in tempObj)) {
+  let tempObj = obj;
+  const keyArr = path.split(".");
+  let i = 0;
+  for (i; i < keyArr.length - 1; i++) {
+    const key = keyArr[i];
+    if (key in tempObj) {
+      tempObj = tempObj[key];
+    } else {
+      throw new Error(`${key} is undefined`);
+      // break
+    }
+  }
+  const key = keyArr[i];
+  const value = tempObj[keyArr[i]];
+  // 检查最后一级是否存在
+  /*if (!(key in tempObj)) {
             throw new Error(`${key} is undefined`)
         }*/
-        if (val !== undefined) {
-              tempObj[key] = val
-        }
-        return {
-            obj: tempObj,
-            key: key,
-            value: value
-        }
-    }
-    // 属性设置相关结束
-
-    
-
-    //关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
-    //穿梭框编辑固定选项时，修改的节点无法立即预览到，需保存后退出重进才能预览到修改后的----bug修改
-
-    const showAssociatedFormsFillRole = ref(true)
-
-    const saveRefreshFormControlAttr = () => {
-        getAssociatedFormsCurrentFieldTree1()
-        showAssociatedFormsFillRole.value = false;
-         // 等待一个短时间的延迟，确保组件卸载完成
-        setTimeout(() => {
-            showAssociatedFormsFillRole.value = true;
-        }, 200);
-    };
-
-    // 多选固定选项删除
+  if (val !== undefined) {
+    tempObj[key] = val;
+  }
+  return {
+    obj: tempObj,
+    key: key,
+    value: value,
+  };
+};
+// 属性设置相关结束
+
+//关联表单数据填充时无法获取当前表单新增且保存的字段，只有关闭重启后方能获取----bug修改
+//穿梭框编辑固定选项时，修改的节点无法立即预览到，需保存后退出重进才能预览到修改后的----bug修改
+
+const showAssociatedFormsFillRole = ref(true);
+
+const saveRefreshFormControlAttr = () => {
+  getAssociatedFormsCurrentFieldTree1();
+  showAssociatedFormsFillRole.value = false;
+  // 等待一个短时间的延迟，确保组件卸载完成
+  setTimeout(() => {
+    showAssociatedFormsFillRole.value = true;
+  }, 200);
+};
+
+// 多选固定选项删除
 const delSelectOption = (index: number, type?: string) => {
-        //liwenxuan 20240508 checkbox 删除选项时提醒  start
-        let delflag = true
-        let breakFlag = 0
-        if(controlData.value.type === 'checkbox'&& controlData.value.config.optionsType==0){
-            //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start 
-            for(let i = 0;i<controlData.value.options.length;i++){
-                if(controlData.value.options[i].value==index){
-                    index = i
-                    break
-                }
-            }
-            //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
-            for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                if(breakFlag>0){
-                    break
-                }
-                for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                    if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                        let del =confirm("您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？");
-                        if (del==true){
-                            breakFlag++
-                            break
-                        }else{
-                            delflag = false
-                            breakFlag++
-                            break
-                        }
-                    }
-                }
-
-                
-            }
+  //liwenxuan 20240508 checkbox 删除选项时提醒  start
+  let delflag = true;
+  let breakFlag = 0;
+  if (
+    controlData.value.type === "checkbox" &&
+    controlData.value.config.optionsType == 0
+  ) {
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index    liwenxuan     多选选择框选项拖动功能 20240815 start
+    for (let i = 0; i < controlData.value.options.length; i++) {
+      if (controlData.value.options[i].value == index) {
+        index = i;
+        break;
+      }
+    }
+    //多选删除时,当前index并不是索引而是value,需找出选择的多选框实际的索引作为index     liwenxuan    多选选择框选项拖动功能 20240815 end
+    for (var i = 0; i < controlData.value.control.glxxszForCheckBox.length; i++) {
+      if (breakFlag > 0) {
+        break;
+      }
+      for (
+        var j = 0;
+        j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length;
+        j++
+      ) {
+        if (
+          controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] ===
+          controlData.value.options[index].value
+        ) {
+          let del = confirm(
+            "您本次删除的选项已在关联选项设置中有所配置，相关关联选项设置将被删除，是否确定删除？"
+          );
+          if (del == true) {
+            breakFlag++;
+            break;
+          } else {
+            delflag = false;
+            breakFlag++;
+            break;
+          }
         }
-        if(delflag === true){
-            //删除相关关联选项设置
-            if(controlData.value.type === 'checkbox'){
-            const todelArr:any = []     
-                for(var i = 0;i < controlData.value.control.glxxszForCheckBox.length;i ++){
-                    for(var j = 0; j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length; j++){
-                        if(controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] === controlData.value.options[index].value){
-                            todelArr.push(controlData.value.control.glxxszForCheckBox[i].id)
-                        }
-                    }
-                }
-                for(var i = 0;i < todelArr.length;i++){
-                    controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter((item: { id: any }) => item.id != todelArr[i])
-                }
-            }
-            //liwenxuan 20240508 checkbox 删除选项时提醒  end
-            if (type === 'tabs' ) {
-                    controlData.value.columns.splice(index, 1)
-            } else {
-                    controlData.value.options.splice(index, 1)
-            }
+      }
+    }
+  }
+  if (delflag === true) {
+    //删除相关关联选项设置
+    if (controlData.value.type === "checkbox") {
+      const todelArr: any = [];
+      for (var i = 0; i < controlData.value.control.glxxszForCheckBox.length; i++) {
+        for (
+          var j = 0;
+          j < controlData.value.control.glxxszForCheckBox[i].selectedOptions.length;
+          j++
+        ) {
+          if (
+            controlData.value.control.glxxszForCheckBox[i].selectedOptions[j] ===
+            controlData.value.options[index].value
+          ) {
+            todelArr.push(controlData.value.control.glxxszForCheckBox[i].id);
+          }
         }
-        
+      }
+      for (var i = 0; i < todelArr.length; i++) {
+        controlData.value.control.glxxszForCheckBox = controlData.value.control.glxxszForCheckBox.filter(
+          (item: { id: any }) => item.id != todelArr[i]
+        );
+      }
+    }
+    //liwenxuan 20240508 checkbox 删除选项时提醒  end
+    if (type === "tabs") {
+      controlData.value.columns.splice(index, 1);
+    } else {
+      controlData.value.options.splice(index, 1);
     }
-    // 多选固定选项增加
+  }
+};
+// 多选固定选项增加
 const addSelectOption = (type: any) => {
-
-
-        if (controlData.value.type === 'cascader') {
-            // 级联时打开弹窗口
-            openAttrDialog('cascader',"级联选择器")
-        } else if (controlData.value.type === 'treeSelect') {
-              openAttrDialog('treeSelect', '编辑组件下拉选项数据')
-        } else {
-            if (type === 'tabs') {
-                controlData.value.columns.push({
-                label: '标签名称',
-                list: []
-                })
-            } else {
-				let maxVal = 1;
-				if(controlData.value.options && controlData.value.options.length > 0){
-					controlData.value.options.forEach((item:any)=>{
-						if(item.value >= maxVal){
-							maxVal = item.value
-						}
-					})
-					maxVal = maxVal*1 + 1
-				}
-                controlData.value.options.push({
-					label: '',
-					value: maxVal.toString()
-                })
-            }
-        }
+  if (controlData.value.type === "cascader") {
+    // 级联时打开弹窗口
+    openAttrDialog("cascader", "级联选择器");
+  } else if (controlData.value.type === "treeSelect") {
+    openAttrDialog("treeSelect", "编辑组件下拉选项数据");
+  } else {
+    if (type === "tabs") {
+      controlData.value.columns.push({
+        label: "标签名称",
+        list: [],
+      });
+    } else {
+      let maxVal = 1;
+      if (controlData.value.options && controlData.value.options.length > 0) {
+        controlData.value.options.forEach((item: any) => {
+          if (item.value >= maxVal) {
+            maxVal = item.value;
+          }
+        });
+        maxVal = maxVal * 1 + 1;
+      }
+      controlData.value.options.push({
+        label: "",
+        value: maxVal.toString(),
+      });
     }
-    // 更多属性弹窗
+  }
+};
+// 更多属性弹窗
 const openAttrDialog = (type?: string, tooltip?: string) => {
-        let editData = controlData.value.control
-        if (controlData.value.type === 'button') {
-            // 按钮组件编辑属性
-            editData = controlData.value.config
-            type = 'button'
-        }
-        switch (type) {
-            case 'treeSelect':
-                editData = controlData.value.control.data
-                break
-            case 'cascader':
-                editData = controlData.value.options
-                break
-            case 'optionsParams': // 选项请求附加参数
-                editData = controlData.value.config.beforeRequest
-                // params.codeType = 'json'
-                break
-            case 'optionsResult':
-                editData = controlData.value.config.afterResponse
-                break
-        }
-    const emitsParams = {
-            content: editData,
-            title: tooltip,
-            type: type,
-            direction: 'ltr',
-            callback: (result: any) => {
-                switch (type) {
-                case 'treeSelect':
-                    controlData.value.control.data = result
-                    break
-                case 'cascader':
-                    controlData.value.options = result
-                    break
-                case 'optionsParams':
-                    controlData.value.config.beforeRequest = result
-                    break
-                case 'optionsResult':
-                    controlData.value.config.afterResponse = result
-                    break
-                case 'button':
-                    controlData.value.config = result
-                    break
-                default:
-                    controlData.value.control = {}
-                    Object.assign(controlData.value.control, result)
-                }
-            }
-        }
-        emits('openDialog', emitsParams)
-    }
-    // 必填校验
+  let editData = controlData.value.control;
+  if (controlData.value.type === "button") {
+    // 按钮组件编辑属性
+    editData = controlData.value.config;
+    type = "button";
+  }
+  switch (type) {
+    case "treeSelect":
+      editData = controlData.value.control.data;
+      break;
+    case "cascader":
+      editData = controlData.value.options;
+      break;
+    case "optionsParams": // 选项请求附加参数
+      editData = controlData.value.config.beforeRequest;
+      // params.codeType = 'json'
+      break;
+    case "optionsResult":
+      editData = controlData.value.config.afterResponse;
+      break;
+  }
+  const emitsParams = {
+    content: editData,
+    title: tooltip,
+    type: type,
+    direction: "ltr",
+    callback: (result: any) => {
+      switch (type) {
+        case "treeSelect":
+          controlData.value.control.data = result;
+          break;
+        case "cascader":
+          controlData.value.options = result;
+          break;
+        case "optionsParams":
+          controlData.value.config.beforeRequest = result;
+          break;
+        case "optionsResult":
+          controlData.value.config.afterResponse = result;
+          break;
+        case "button":
+          controlData.value.config = result;
+          break;
+        default:
+          controlData.value.control = {};
+          Object.assign(controlData.value.control, result);
+      }
+    },
+  };
+  emits("openDialog", emitsParams);
+};
+// 必填校验
 const requiredChange = (val: any) => {
-        if (!controlData.value.item?.rules) {
-              controlData.value.item.rules = []
-        }
-        if (val) {
-            controlData.value.item.rules.push({
-                required: true,
-                message: '必填项',
-                trigger: 'change'
-            })
-        } else {
-              controlData.value.item.rules.splice(0, 1)
-        }
-    }
-    // 添加校验规则
+  if (!controlData.value.item?.rules) {
+    controlData.value.item.rules = [];
+  }
+  if (val) {
+    controlData.value.item.rules.push({
+      required: true,
+      message: "必填项",
+      trigger: "change",
+    });
+  } else {
+    controlData.value.item.rules.splice(0, 1);
+  }
+};
+// 添加校验规则
 const addRules = (tooltip: string) => {
-        if (!controlData.value.item?.rules) {
-              controlData.value.item.rules = []
-        }
-    const params = {
-            content: controlData.value.item?.rules,
-            title: tooltip,
-            direction: 'ltr',
-            callback: (result: any) => {
-                Object.assign(controlData.value.item.rules, result)
-            }
-        }
-        emits('openDialog', params)
-    }
-    // 根据不同类型判断是否显示当前属性
+  if (!controlData.value.item?.rules) {
+    controlData.value.item.rules = [];
+  }
+  const params = {
+    content: controlData.value.item?.rules,
+    title: tooltip,
+    direction: "ltr",
+    callback: (result: any) => {
+      Object.assign(controlData.value.item.rules, result);
+    },
+  };
+  emits("openDialog", params);
+};
+// 根据不同类型判断是否显示当前属性
 const showHide = (type: string[], show?: boolean) => {
-        // show=true 条件成立显示，false符合条件隐藏
-        if (
-            (type && type.length === 0) ||
-            Object.keys(controlData.value).length === 0
-        ) {
-              return false
-        }
-    const index = type.indexOf(controlData.value.type)
-        return show ? index !== -1 : index === -1
-    }
-    // 子表时添加序号和操作列
+  // show=true 条件成立显示，false符合条件隐藏
+  if ((type && type.length === 0) || Object.keys(controlData.value).length === 0) {
+    return false;
+  }
+  const index = type.indexOf(controlData.value.type);
+  return show ? index !== -1 : index === -1;
+};
+// 子表时添加序号和操作列
 const tableColumnAdd = (val: string) => {
-    const item = {
-            name: 'index',
-            type: 'index',
-            item: {
-                label: '序号'
-            },
-            control: {},
-            config: {}
-        }
-        if (val) {
-              controlData.value.list.unshift(item)
-        } else {
-              controlData.value.list.splice(0, 1)
-        }
-    }
-    // 校验规则必填勾选设置，存在校验规则时勾选
+  const item = {
+    name: "index",
+    type: "index",
+    item: {
+      label: "序号",
+    },
+    control: {},
+    config: {},
+  };
+  if (val) {
+    controlData.value.list.unshift(item);
+  } else {
+    controlData.value.list.splice(0, 1);
+  }
+};
+// 校验规则必填勾选设置，存在校验规则时勾选
 const checkboxRequired = computed(() => {
-    const val = controlData.value && controlData.value.item?.rules
-	// console.log("校验规则必填勾选设置",val && val.length > 0)
-		if(val && val.length > 0){
-			return true
-		}else{
-			return false
-		}
-        // return val && val.length > 0
-    })
-    // 快速添加一条校验规则
+  const val = controlData.value && controlData.value.item?.rules;
+  // console.log("校验规则必填勾选设置",val && val.length > 0)
+  if (val && val.length > 0) {
+    return true;
+  } else {
+    return false;
+  }
+  // return val && val.length > 0
+});
+// 快速添加一条校验规则
 const addRulesFast = () => {
-        if (!controlData.value.customRules) {
-              controlData.value.customRules = []
-        }
-        controlData.value.customRules.push({
-            type: 'required',
-            message: '必填项',
-            trigger: 'blur'
-        })
-    }
-    // 删除一条校验规则
+  if (!controlData.value.customRules) {
+    controlData.value.customRules = [];
+  }
+  controlData.value.customRules.push({
+    type: "required",
+    message: "必填项",
+    trigger: "blur",
+  });
+};
+// 删除一条校验规则
 const delAddRules = (index: number) => {
-        controlData.value.customRules &&
-        controlData.value.customRules.splice(index, 1)
-    }
-    
-    //添加一条编码规则
+  controlData.value.customRules && controlData.value.customRules.splice(index, 1);
+};
+
+//添加一条编码规则
 const addNumRules = () => {
-        if (!controlData.value.config.customRules) {
-            controlData.value.config.customRules = []
-        }
-        controlData.value.config.customRules.push({
-            type:'time',
-            rule:"YYYYMMDD"
-        })
-    }
-    //删除一条编码规则
+  if (!controlData.value.config.customRules) {
+    controlData.value.config.customRules = [];
+  }
+  controlData.value.config.customRules.push({
+    type: "time",
+    rule: "YYYYMMDD",
+  });
+};
+//删除一条编码规则
 const delNumRules = (index: number) => {
-        controlData.value.config.customRules &&
-        controlData.value.config.customRules.splice(index, 1)
-    }
-    
-    // 编辑表单样式
+  controlData.value.config.customRules &&
+    controlData.value.config.customRules.splice(index, 1);
+};
+
+// 编辑表单样式
 const editFormStyle = (tooltip: string) => {
-        emits('openDialog', {
-            codeType: 'css',
-            direction: 'ltr',
-            type: 'css',
-            title: tooltip
-        })
-    }
+  emits("openDialog", {
+    codeType: "css",
+    direction: "ltr",
+    type: "css",
+    title: tooltip,
+  });
+};
 const editFormDict = (tooltip: string) => {
-        emits('openDialog', {
-            type: 'dict',
-            direction: 'ltr',
-            codeType: 'json',
-            title: tooltip
-        })
-    }
-     // 根据选定数据源获取表单字段
- const getFormFieldBySource = (id?: string) => {
-        if (state.isSearch) {
-            // 搜索设计这里不需要数据源
-            return
-        }
-    const source = id
-        if (source) {
-            getRequest('sourceById', { id: source })
-                .then(res => {
-                    // console.log(res)
-                const tableData = res.data.result?.tableData
-                    if (tableData && tableData.length) {
-                        state.dataSourceList = tableData.filter(
-                        (item: any) => item.enterable
-                        )
-                    }
-                })
-                .catch(res => {
-                    // console.log(res)
-                })
+  emits("openDialog", {
+    type: "dict",
+    direction: "ltr",
+    codeType: "json",
+    title: tooltip,
+  });
+};
+// 根据选定数据源获取表单字段
+const getFormFieldBySource = (id?: string) => {
+  if (state.isSearch) {
+    // 搜索设计这里不需要数据源
+    return;
+  }
+  const source = id;
+  if (source) {
+    getRequest("sourceById", { id: source })
+      .then((res) => {
+        // console.log(res)
+        const tableData = res.data.result?.tableData;
+        if (tableData && tableData.length) {
+          state.dataSourceList = tableData.filter((item: any) => item.enterable);
         }
-    }
+      })
+      .catch((res) => {
+        // console.log(res)
+      });
+  }
+};
 const getDataSource = () => {
-        // 获取数据源，表单设计才加载，搜索设置不需要
-        if (!state.isSearch) {
-            // getRequest('sourceList').then((res: any) => {
-            // 	dataSourceOption.value = res.data.list
-            // 	//dataSourceOption.value.unshift({ name: '无', id: '' })
-            // })
-        }
-    }
-    // 表单属性修改
+  // 获取数据源，表单设计才加载，搜索设置不需要
+  if (!state.isSearch) {
+    // getRequest('sourceList').then((res: any) => {
+    // 	dataSourceOption.value = res.data.list
+    // 	//dataSourceOption.value.unshift({ name: '无', id: '' })
+    // })
+  }
+};
+// 表单属性修改
 const formAttrChange = (obj: any, val?: any) => {
-        // console.log("表单属性修改--->",obj,val,{ [obj.key]: obj.value })
-        if (obj.key === 'source') {
-            getFormFieldBySource(obj.value) // 改变了数据源了，重新请求数据
-            // 清空设计区已选择的组件，再一次选择时字段标识才会变
-            store.setActiveKey('')
-            store.setControlAttr({})
-        }
-        if (['formName', 'source'].includes(obj.key)) {
-            emits(
-                'update:formOtherData',
-                Object.assign(props.formOtherData, { [obj.key]: obj.value })
-            )
-            formData.value[obj.key] = obj.value
-              return
-        }
-        if (obj.path === 'config') {
-              formConfig.value[obj.key] = obj.value || val
-        } else {
-              formData.value[obj.key] = obj.value
-        }
-    }
-    // 返回选项配置提示
+  // console.log("表单属性修改--->",obj,val,{ [obj.key]: obj.value })
+  if (obj.key === "source") {
+    getFormFieldBySource(obj.value); // 改变了数据源了，重新请求数据
+    // 清空设计区已选择的组件，再一次选择时字段标识才会变
+    store.setActiveKey("");
+    store.setControlAttr({});
+  }
+  if (["formName", "source"].includes(obj.key)) {
+    emits(
+      "update:formOtherData",
+      Object.assign(props.formOtherData, { [obj.key]: obj.value })
+    );
+    formData.value[obj.key] = obj.value;
+    return;
+  }
+  if (obj.path === "config") {
+    formConfig.value[obj.key] = obj.value || val;
+  } else {
+    formData.value[obj.key] = obj.value;
+  }
+};
+// 返回选项配置提示
 const getOptionPlaceholder = (type: number) => {
-        switch (type) {
-            case 1:
-                return '数据源接口URL,可带参数'
-            case 2:
-                return '字典key，默认为字段标识'
-        }
-        return ''
-    }
-    // 快速添加校验规则改变时，填写默认的校验提示信息
+  switch (type) {
+    case 1:
+      return "数据源接口URL,可带参数";
+    case 2:
+      return "字典key，默认为字段标识";
+  }
+  return "";
+};
+// 快速添加校验规则改变时，填写默认的校验提示信息
 const rulesSelectChange = (item: any, val: string) => {
-    const filter = validate.filter(item => item.type === val)
-        if (filter && filter.length) {
-              item.message = filter[0].message
-        }
-    }
-const rulesSelectNumChange = (item: any, val: string) => {
-        // console.log("快速添加校验规则改变时",item,val)
-    const filter = state.numberRulesList.filter(item => item.type === val)
-        if (filter && filter.length) {
-              item.message = filter[0].msg
-            if(val == "time") {
-                item.rule = "YYYYMMDD"
-            }else{
-                item.rule = ""
-            }
-        }
+  const filter = validate.filter((item) => item.type === val);
+  if (filter && filter.length) {
+    item.message = filter[0].message;
+  }
+};
+const rulesSelectNumChange = (item: any, val: string) => {
+  // console.log("快速添加校验规则改变时",item,val)
+  const filter = state.numberRulesList.filter((item) => item.type === val);
+  if (filter && filter.length) {
+    item.message = filter[0].msg;
+    if (val == "time") {
+      item.rule = "YYYYMMDD";
+    } else {
+      item.rule = "";
     }
-    // options动态选项数据源请求时
+  }
+};
+// options动态选项数据源请求时
 const optionsEvent = (type: string, tooltip?: string) => {
-        openAttrDialog(type, tooltip)
-    }
+  openAttrDialog(type, tooltip);
+};
 const eventClick = (type: string, tooltip?: string) => {
-        emits('openDialog', { type: type, title: tooltip, direction: 'ltr' })
-    }
-    getDataSource()
-    defineExpose({ getFormFieldBySource,saveRefreshFormControlAttr })
-    //判断输入框是否可写
-const isNotWrite = (val:any) =>{
-        // console.log("判断输入框是否可写--->",val,props.customerformid)
-        if(val.key === "name" && props.customerformid != ""){
-            return true
-        }
-        return false
-    }
-const isNotWriteWord = (val:any) =>{
-	// console.log("isNotWriteWord---->",val)
-	// console.log("isNotWriteWord--formField-->",props.formField)
-	if(val.eventName === "filedNameKey" && props.customerformid != "" && props.formField && Array.isArray(props.formField) && props.formField.includes(val.value) ){
-		// if(props.formField.includes(val.value)){
-			return true
-		// }
-		
-	}
-	return false
-}    
-const unitInfo = ref<any>()
-const formListmap = ref<any>()
-const subUnit = ref<any>()
-    //默认值处理
-const digitPageSub = (val:any,envt:any) => {
-        console.log("默认值处理--->",val,envt,props.formData)
-    
-        // console.log("默认值处理-1-->",props.formList)
-        // console.log("默认值处理-2-->",props.formConfig)
-        // console.log("默认值处理--3->",props.formOtherData)
-        // console.log("默认值处理--4->",props.customerformid)
-        // console.log("默认值处理--5->",controlData.value)
-        // console.log("默认值处理-6-->",val)
-		// console.log("默认值处理-7-->",mathBoxShow)
-		// console.log("默认值处理-8-->",attrList.value)
-        subUnit.value = val
-        controlData.value.selectvalue = envt
-        formListmap.value = props.formList
-        if(envt == "simple"){
-            unitInfo.value = attrList.value
-            mathBoxShow.value = true
-			val.control.modelValue = ""
-        }else{
-			unitInfo.value = ""
-            mathBoxShow.value = false
-		}
-    }
-const openMathDialog = (val:any) => {
-        subUnit.value = val
-        formListmap.value = props.formList
-        unitInfo.value = attrList.value
-        mathBoxShow.value = true
-    }
-    //返回值处理
-const updataDigit = (key:string,val:any) => {
-    
-        // console.log("默认值处理-1-->",props.formList)
-        // console.log("默认值处理-2-->",props.formConfig)
-        // console.log("默认值处理--3->",props.formOtherData)
-        // console.log("默认值处理--4->",val)
-        formConfig.value[key] = {
-            mathsFormula:val.mathsFormula,
-            takingMethod:val.takingMethod,
-            digit:val.digit
-        }
-        // console.log("返回值处理--->",formConfig.value)
-        attrList.value.forEach((item:any)=>{
-            // console.log("返回值处理--1->",item)
-            if(item.type == "digitpage"){
-                item.control.mathFormula = {
-                    formulaHtml:val.formulaHtml,
-                    mathsString:val.mathsString,
-                    mathsFormula:val.mathsFormula,
-                    takingMethod:val.takingMethod,
-                    digit:val.digit
-                }
-            }
-        })
-        // console.log("默认值处理-5-->",props.formConfig)
-    }
-    
-    
-    //liwenxuan 20240108 vidioupload  start
-    
-import { VideoMsg } from '@/api/DesignForm/types'
-import { genFileId } from 'element-plus'
-import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
-    
-    //更改已上传的视频:el-upload中设置 limit 和 on-exceed 可以在选中时自动替换上一个文件。
-const upload = ref<UploadInstance>()
-    
-const handleExceed: UploadProps['onExceed'] = (files) => {
-      upload.value!.clearFiles()
-  const file = files[0] as UploadRawFile
-      file.uid = genFileId()
-      upload.value!.handleStart(file)
+  emits("openDialog", { type: type, title: tooltip, direction: "ltr" });
+};
+getDataSource();
+defineExpose({ getFormFieldBySource, saveRefreshFormControlAttr });
+//判断输入框是否可写
+const isNotWrite = (val: any) => {
+  // console.log("判断输入框是否可写--->",val,props.customerformid)
+  if (val.key === "name" && props.customerformid != "") {
+    return true;
+  }
+  return false;
+};
+const isNotWriteWord = (val: any) => {
+  // console.log("isNotWriteWord---->",val)
+  // console.log("isNotWriteWord--formField-->",props.formField)
+  if (
+    val.eventName === "filedNameKey" &&
+    props.customerformid != "" &&
+    props.formField &&
+    Array.isArray(props.formField) &&
+    props.formField.includes(val.value)
+  ) {
+    // if(props.formField.includes(val.value)){
+    return true;
+    // }
+  }
+  return false;
+};
+const unitInfo = ref<any>();
+const formListmap = ref<any>();
+const subUnit = ref<any>();
+//默认值处理
+const digitPageSub = (val: any, envt: any) => {
+  console.log("默认值处理--->", val, envt, props.formData);
+
+  // console.log("默认值处理-1-->",props.formList)
+  // console.log("默认值处理-2-->",props.formConfig)
+  // console.log("默认值处理--3->",props.formOtherData)
+  // console.log("默认值处理--4->",props.customerformid)
+  // console.log("默认值处理--5->",controlData.value)
+  // console.log("默认值处理-6-->",val)
+  // console.log("默认值处理-7-->",mathBoxShow)
+  // console.log("默认值处理-8-->",attrList.value)
+  subUnit.value = val;
+  controlData.value.selectvalue = envt;
+  formListmap.value = props.formList;
+  if (envt == "simple") {
+    unitInfo.value = attrList.value;
+    mathBoxShow.value = true;
+    val.control.modelValue = "";
+  } else {
+    unitInfo.value = "";
+    mathBoxShow.value = false;
+  }
+};
+const openMathDialog = (val: any) => {
+  subUnit.value = val;
+  formListmap.value = props.formList;
+  unitInfo.value = attrList.value;
+  mathBoxShow.value = true;
+};
+//返回值处理
+const updataDigit = (key: string, val: any) => {
+  // console.log("默认值处理-1-->",props.formList)
+  // console.log("默认值处理-2-->",props.formConfig)
+  // console.log("默认值处理--3->",props.formOtherData)
+  // console.log("默认值处理--4->",val)
+  formConfig.value[key] = {
+    mathsFormula: val.mathsFormula,
+    takingMethod: val.takingMethod,
+    digit: val.digit,
+  };
+  // console.log("返回值处理--->",formConfig.value)
+  attrList.value.forEach((item: any) => {
+    // console.log("返回值处理--1->",item)
+    if (item.type == "digitpage") {
+      item.control.mathFormula = {
+        formulaHtml: val.formulaHtml,
+        mathsString: val.mathsString,
+        mathsFormula: val.mathsFormula,
+        takingMethod: val.takingMethod,
+        digit: val.digit,
+      };
     }
-    //每个视频上传控件对应一个videoMsg[videoIndex]
+  });
+  // console.log("默认值处理-5-->",props.formConfig)
+};
+
+//liwenxuan 20240108 vidioupload  start
+
+import { VideoMsg } from "@/api/DesignForm/types";
+import { genFileId } from "element-plus";
+import type { UploadInstance, UploadProps, UploadRawFile } from "element-plus";
+
+//更改已上传的视频:el-upload中设置 limit 和 on-exceed 可以在选中时自动替换上一个文件。
+const upload = ref<UploadInstance>();
+
+const handleExceed: UploadProps["onExceed"] = (files) => {
+  upload.value!.clearFiles();
+  const file = files[0] as UploadRawFile;
+  file.uid = genFileId();
+  upload.value!.handleStart(file);
+};
+//每个视频上传控件对应一个videoMsg[videoIndex]
 const videoIndex = ref(0);
-    
-    //上传成功钩子
-    function videoUploadOk(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {
-    const { control = {} } : { control: any } = controlData.value
-        control.videoMsg[videoIndex.value].url = response.data.url;
-        control.videoMsg[videoIndex.value].videoReady = true;
-        control.videoMsg[videoIndex.value].CreatedAt = response.data.CreatedAt;
-        control.videoMsg[videoIndex.value].UpdatedAt = response.data.UpdatedAt;
-        control.videoMsg[videoIndex.value].fileSize = response.data.fileSize;
-        control.videoMsg[videoIndex.value].id = response.data.id;
-        control.videoMsg[videoIndex.value].key = response.data.key;
-        control.videoMsg[videoIndex.value].name = response.data.name;
-        control.videoMsg[videoIndex.value].physicspath = response.data.physicspath;
-        control.videoMsg[videoIndex.value].size = response.data.size;
-        control.videoMsg[videoIndex.value].tag = response.data.tag;
-        control.videoMsg[videoIndex.value].type = response.data.type;
-    }
-    
-    //删除钩子 禁止删除
-    function beforeRemove(){
-        return false;
-    }
-    
-    //上传失败钩子
-    function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles){
-        alert("上传失败,请重试")
-        // console.log("上传失败"+error);
-    }
-    
-    //liwenxuan 20240108 vidioupload  end
-    
-    
-    
-    
-    //liwenxuan 20240111 carousel  start
-    
-import { Delete } from '@element-plus/icons-vue'
-import { CarsuselConfig } from '@/api/DesignForm/types'
-import errimg from '@/assets/404_images/untilUploadImg.png'
+
+//上传成功钩子
+function videoUploadOk(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) {
+  const { control = {} }: { control: any } = controlData.value;
+  control.videoMsg[videoIndex.value].url = response.data.url;
+  control.videoMsg[videoIndex.value].videoReady = true;
+  control.videoMsg[videoIndex.value].CreatedAt = response.data.CreatedAt;
+  control.videoMsg[videoIndex.value].UpdatedAt = response.data.UpdatedAt;
+  control.videoMsg[videoIndex.value].fileSize = response.data.fileSize;
+  control.videoMsg[videoIndex.value].id = response.data.id;
+  control.videoMsg[videoIndex.value].key = response.data.key;
+  control.videoMsg[videoIndex.value].name = response.data.name;
+  control.videoMsg[videoIndex.value].physicspath = response.data.physicspath;
+  control.videoMsg[videoIndex.value].size = response.data.size;
+  control.videoMsg[videoIndex.value].tag = response.data.tag;
+  control.videoMsg[videoIndex.value].type = response.data.type;
+}
+
+//删除钩子 禁止删除
+function beforeRemove() {
+  return false;
+}
+
+//上传失败钩子
+function videoUploadErr(error: Error, uploadFile: UploadFile, uploadFiles: UploadFiles) {
+  alert("上传失败,请重试");
+  // console.log("上传失败"+error);
+}
+
+//liwenxuan 20240108 vidioupload  end
+
+//liwenxuan 20240111 carousel  start
+
+import { Delete } from "@element-plus/icons-vue";
+import { CarsuselConfig } from "@/api/DesignForm/types";
+import errimg from "@/assets/404_images/untilUploadImg.png";
 import { v4 as uuidv4 } from "uuid";
-    
-    //轮播图设置弹窗显示控制
-const dialogTableVisible = ref(false)
-    //穿梭框设置弹窗显示控制
-const transferDialogTableVisible = ref(false)
-    
-    //图片展示显示控制
-const showImagePreview = ref(false)
 
+//轮播图设置弹窗显示控制
+const dialogTableVisible = ref(false);
+//穿梭框设置弹窗显示控制
+const transferDialogTableVisible = ref(false);
 
-const currentAsfChangeCount = ref(0)
-    
-    //最近点击的上传按钮对应的imgId
-    let currentUploadImgid = "";
-    
-    //刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
-    watch(()=>store.activeKey, (newVal) => {
-        
-        //啊啊啊啊
-        if(controlData.value.type==='lowcodeCarsusel'){
-        const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-            carsuselConfigData.forEach(element => {
-                // console.log(element)
-                if(element.imgId==''){
-                    // console.log("初始化imgid")
-                    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-                    element.imgId = onlyNumber;
-                }
-            });
-        }else if(controlData.value.type==='associatedForms'){
-            currentAsfChangeCount.value = 0
-            //alert(1)
-            /* if(controlData.value.item.label){
+//图片展示显示控制
+const showImagePreview = ref(false);
+
+const currentAsfChangeCount = ref(0);
+
+//最近点击的上传按钮对应的imgId
+let currentUploadImgid = "";
+
+//刚拖拽视频组件时,初始化imgid监听designForm.activeKey,变化时,如果controlData.value.type=='lowcodeCarsusel',就遍历轮播图数组把imgid=''的都生成uuid
+watch(
+  () => store.activeKey,
+  (newVal) => {
+    //啊啊啊啊
+    if (controlData.value.type === "lowcodeCarsusel") {
+      const carsuselConfigData: CarsuselConfig[] =
+        controlData.value.control.carsuselConfigArr;
+      carsuselConfigData.forEach((element) => {
+        // console.log(element)
+        if (element.imgId == "") {
+          // console.log("初始化imgid")
+          let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+          element.imgId = onlyNumber;
+        }
+      });
+    } else if (controlData.value.type === "associatedForms") {
+      currentAsfChangeCount.value = 0;
+      //alert(1)
+      /* if(controlData.value.item.label){
 
             }else{
                 controlData.value.item.label = "关联表单"
             }
             controlData.value.item.showLabel = true */
-            //console.log(controlData.value.control.fillRoles.master)
-            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.master.length==0){
-                controlData.value.control.fillRoles.master = [
-						{
-							leftValue: '',
-							rightValue: '',
-							id: '',
-						}
-					]
-            }
-            if(controlData.value.control.fillRoles&&controlData.value.control.fillRoles.child.length==0){
-                controlData.value.control.fillRoles.child = [
-								{
-									id: '',
-									asfChildTableKey: '',
-									filterCondition:{
-										conditionHtml: '',
-										conditionHtmlCopy: '',
-										gongShi:{
-											formulaHtml:'',
-											mathsFormula:'',
-											mathsString:'',
-										},
-									},
-									childRoles:[]
-								},
-							]
-            }
-            controlData.value.control.fillRoles.master[0].id = uuidv4().replaceAll('-','').toString();
-            controlData.value.control.fillRoles.child[0].id = uuidv4().replaceAll('-','').toString();
-        }
-        //实现关联表单设置可选字段中没有当前字段效果    start
-        // console.log(controlData.value.name)
-        resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
-        // console.log(resDataForGlxxszExceptself1)
-        
-        for(let i = 0;i<resDataForGlxxszExceptself1.length;i++){
-            let strArr:[string] = resDataForGlxxszExceptself1[i].id.split(":")
-            // console.log(strArr)
-            let str = strArr[strArr.length-1]
-            // console.log(str)
-            if(str==newVal){
-                resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-        // console.log(resDataForGlxxszExceptself1)
-        if(getAssociatedFormsCurrentFieldTreeData && getAssociatedFormsCurrentFieldTreeData.treeAttrs && getAssociatedFormsCurrentFieldTreeData.treeAttrs!=undefined){
-            associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
-                id: 'rootid_'+getAssociatedFormsCurrentFieldTreeData.label,
-                //label: '当前表单',
-                label: '当前表单-'+getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
-                children: resDataForGlxxszExceptself1,
-                treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs,//
-            }]
-        }
-        
-        
-        //associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value.children = [...resDataForGlxxszExceptself1]
-        //实现关联表单设置可选字段中没有当前字段效果    end
-    })
-    //轮播图图片上传成功钩子
-    function carouselImgUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
-    const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-            carsuselConfigData.forEach(element => {
-                if(element.imgId==currentUploadImgid){
-                    element.imgUrl=response.data.url
-                    element.uploadFlag=true
-                }
-            });
-        
-    }
-    
-    //轮播图所有已上传的图片的url,点击略缩图展示大图用
-const carouselImgUrlList = computed(() => {
-    const list:string[] = [];
-    const carsuselConfigData:CarsuselConfig[] = store.controlAttr.control.carsuselConfigArr
-        carsuselConfigData.forEach(element => {
-            if(element.uploadFlag===true){
-                list.push(element.imgUrl)
-            }
-        });
-        return list;
-    })
-    
-    //轮播图设置table
-    function createRow(clickedRow:any){
-    const newRow:CarsuselConfig = {
-            uploadFlag:false,
-            imgId:'',
-            imgSort:1,
-            imgUrl: '',
-            link: ''
-        }
-        let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        newRow.imgId = onlyNumber;
-    const nextSort:number = clickedRow.sort+1;
-        newRow.imgSort = nextSort;
-        controlData.value.control.carsuselConfigArr.push(newRow)
-    }
-    
-    function deleteRow(clickedRow:any){
-        //alert('删除一行')
-    const carsuselConfigData:CarsuselConfig[] = controlData.value.control.carsuselConfigArr
-        for (var i = 0; i < carsuselConfigData.length; i++) {
-            if(carsuselConfigData[i].imgId===clickedRow.imgId){
-                carsuselConfigData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-    }
-    
-    //关闭大图展示
-const closePreview = () => {
-        showImagePreview.value = false
+      //console.log(controlData.value.control.fillRoles.master)
+      if (
+        controlData.value.control.fillRoles &&
+        controlData.value.control.fillRoles.master.length == 0
+      ) {
+        controlData.value.control.fillRoles.master = [
+          {
+            leftValue: "",
+            rightValue: "",
+            id: "",
+          },
+        ];
+      }
+      if (
+        controlData.value.control.fillRoles &&
+        controlData.value.control.fillRoles.child.length == 0
+      ) {
+        controlData.value.control.fillRoles.child = [
+          {
+            id: "",
+            asfChildTableKey: "",
+            filterCondition: {
+              conditionHtml: "",
+              conditionHtmlCopy: "",
+              gongShi: {
+                formulaHtml: "",
+                mathsFormula: "",
+                mathsString: "",
+              },
+            },
+            childRoles: [],
+          },
+        ];
+      }
+      controlData.value.control.fillRoles.master[0].id = uuidv4()
+        .replaceAll("-", "")
+        .toString();
+      controlData.value.control.fillRoles.child[0].id = uuidv4()
+        .replaceAll("-", "")
+        .toString();
     }
-    
-    //开启大图展示
-const handlePreview = (index: number, row: any) => {
-        showImagePreview.value = true
+    //实现关联表单设置可选字段中没有当前字段效果    start
+    // console.log(controlData.value.name)
+    resDataForGlxxszExceptself1 = JSON.parse(JSON.stringify(resDataForGlxxszExceptself));
+    // console.log(resDataForGlxxszExceptself1)
+
+    for (let i = 0; i < resDataForGlxxszExceptself1.length; i++) {
+      let strArr: [string] = resDataForGlxxszExceptself1[i].id.split(":");
+      // console.log(strArr)
+      let str = strArr[strArr.length - 1];
+      // console.log(str)
+      if (str == newVal) {
+        resDataForGlxxszExceptself1.splice(i, 1); // 将使后面的元素依次前移，数组长度减1
+        i--; // 如果不减，将漏掉一个元素
+      }
     }
-    
-const changeCurrentUploadImgid = (clickedRow:any) => {
-        currentUploadImgid = clickedRow.imgId
+    // console.log(resDataForGlxxszExceptself1)
+    if (
+      getAssociatedFormsCurrentFieldTreeData &&
+      getAssociatedFormsCurrentFieldTreeData.treeAttrs &&
+      getAssociatedFormsCurrentFieldTreeData.treeAttrs != undefined
+    ) {
+      associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [
+        {
+          id: "rootid_" + getAssociatedFormsCurrentFieldTreeData.label,
+          //label: '当前表单',
+          label: "当前表单-" + getAssociatedFormsCurrentFieldTreeData.treeAttrs.show,
+          children: resDataForGlxxszExceptself1,
+          treeAttrs: getAssociatedFormsCurrentFieldTreeData.treeAttrs, //
+        },
+      ];
     }
-	const showModeSelectOptions = [
-	{
-		value: '自定义像素值',
-		label: '自定义像素值',
-	},
-	{
-		value: '自定义占父容器比例',
-		label: '自定义占父容器比例',
-	},
-]
 
-const floatSelectOptions = [
-	{
-		value: 'left',
-		label: '左',
-	},
-	{
-		value: 'right',
-		label: '右',
-	},
-]
-
-
-const dataSource = ref<Tree[]>([]) 
-interface Tree {
-	id?: string
-	label: string
-	disabled?: boolean
-	children?: Tree[]
-	parentId?: string
-	[key: string]: any
+    //associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value.children = [...resDataForGlxxszExceptself1]
+    //实现关联表单设置可选字段中没有当前字段效果    end
+  }
+);
+//轮播图图片上传成功钩子
+function carouselImgUploadSuccess(
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) {
+  const carsuselConfigData: CarsuselConfig[] =
+    controlData.value.control.carsuselConfigArr;
+  carsuselConfigData.forEach((element) => {
+    if (element.imgId == currentUploadImgid) {
+      element.imgUrl = response.data.url;
+      element.uploadFlag = true;
+    }
+  });
 }
 
+//轮播图所有已上传的图片的url,点击略缩图展示大图用
+const carouselImgUrlList = computed(() => {
+  const list: string[] = [];
+  const carsuselConfigData: CarsuselConfig[] =
+    store.controlAttr.control.carsuselConfigArr;
+  carsuselConfigData.forEach((element) => {
+    if (element.uploadFlag === true) {
+      list.push(element.imgUrl);
+    }
+  });
+  return list;
+});
 
-const addRootNode = () => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	controlData.value.control.fixedOptions.push({
-		id: onlyNumber,
-        label: '新根节点',
-		disabled: false,
-		children: [],
-	}) 
-}
-
-const append = (data: Tree) => {
-	let onlyNumber = uuidv4().replaceAll('-','').toString();   
-	const newChild = { id: onlyNumber, label: '新节点', disabled:false,children: [] }
-	if (!data.children) {
-		data.children = []
-	}
-	data.children.push(newChild)
-	dataSource.value = [...dataSource.value]
+//轮播图设置table
+function createRow(clickedRow: any) {
+  const newRow: CarsuselConfig = {
+    uploadFlag: false,
+    imgId: "",
+    imgSort: 1,
+    imgUrl: "",
+    link: "",
+  };
+  let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+  newRow.imgId = onlyNumber;
+  const nextSort: number = clickedRow.sort + 1;
+  newRow.imgSort = nextSort;
+  controlData.value.control.carsuselConfigArr.push(newRow);
 }
 
-const remove = (node: Node, data: Tree) => {
-	let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
-	if(really){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children.splice(index, 1)
-		dataSource.value = [...dataSource.value]
-	}
-	
+function deleteRow(clickedRow: any) {
+  //alert('删除一行')
+  const carsuselConfigData: CarsuselConfig[] =
+    controlData.value.control.carsuselConfigArr;
+  for (var i = 0; i < carsuselConfigData.length; i++) {
+    if (carsuselConfigData[i].imgId === clickedRow.imgId) {
+      carsuselConfigData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
 }
 
+//关闭大图展示
+const closePreview = () => {
+  showImagePreview.value = false;
+};
 
+//开启大图展示
+const handlePreview = (index: number, row: any) => {
+  showImagePreview.value = true;
+};
+
+const changeCurrentUploadImgid = (clickedRow: any) => {
+  currentUploadImgid = clickedRow.imgId;
+};
+const showModeSelectOptions = [
+  {
+    value: "自定义像素值",
+    label: "自定义像素值",
+  },
+  {
+    value: "自定义占父容器比例",
+    label: "自定义占父容器比例",
+  },
+];
 
-const changeLabel = (node:Node,data:Tree) =>{
-	let favDrink = prompt("请输入:");
-	if(favDrink!=null && favDrink.length>0){
-		const parent = node.parent
-		const children: Tree[] = parent.data.children || parent.data
-		const index = children.findIndex((d) => d.id === data.id)
-		children[index].label = favDrink
-		dataSource.value = [...dataSource.value]
-	}
-	
-	
-}
-
-const setNodeEnable = (node:Node,data:Tree) =>{
-	const parent = node.parent
-	const children: Tree[] = parent.data.children || parent.data
-	const index = children.findIndex((d) => d.id === data.id)
-	children[index].disabled = !children[index].disabled
-	dataSource.value = [...dataSource.value]
-	
+const floatSelectOptions = [
+  {
+    value: "left",
+    label: "左",
+  },
+  {
+    value: "right",
+    label: "右",
+  },
+];
+
+const dataSource = ref<Tree[]>([]);
+interface Tree {
+  id?: string;
+  label: string;
+  disabled?: boolean;
+  children?: Tree[];
+  parentId?: string;
+  [key: string]: any;
 }
 
+const addRootNode = () => {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString();
+  controlData.value.control.fixedOptions.push({
+    id: onlyNumber,
+    label: "新根节点",
+    disabled: false,
+    children: [],
+  });
+};
 
+const append = (data: Tree) => {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString();
+  const newChild = { id: onlyNumber, label: "新节点", disabled: false, children: [] };
+  if (!data.children) {
+    data.children = [];
+  }
+  data.children.push(newChild);
+  dataSource.value = [...dataSource.value];
+};
 
+const remove = (node: Node, data: Tree) => {
+  let really = confirm("确认删除吗?\n将删除本节点与本节点的所有子孙节点!");
+  if (really) {
+    const parent = node.parent;
+    const children: Tree[] = parent.data.children || parent.data;
+    const index = children.findIndex((d) => d.id === data.id);
+    children.splice(index, 1);
+    dataSource.value = [...dataSource.value];
+  }
+};
+
+const changeLabel = (node: Node, data: Tree) => {
+  let favDrink = prompt("请输入:");
+  if (favDrink != null && favDrink.length > 0) {
+    const parent = node.parent;
+    const children: Tree[] = parent.data.children || parent.data;
+    const index = children.findIndex((d) => d.id === data.id);
+    children[index].label = favDrink;
+    dataSource.value = [...dataSource.value];
+  }
+};
 
-
-
+const setNodeEnable = (node: Node, data: Tree) => {
+  const parent = node.parent;
+  const children: Tree[] = parent.data.children || parent.data;
+  const index = children.findIndex((d) => d.id === data.id);
+  children[index].disabled = !children[index].disabled;
+  dataSource.value = [...dataSource.value];
+};
 
 //图片上传成功钩子
-function lowcodeImageUploadSuccess(response: any, uploadFile: UploadFile, uploadFiles: UploadFiles){
-	const element = controlData.value.control
-	element.imgUrl=response.data.url
-	element.uploadFlag=true
+function lowcodeImageUploadSuccess(
+  response: any,
+  uploadFile: UploadFile,
+  uploadFiles: UploadFiles
+) {
+  const element = controlData.value.control;
+  element.imgUrl = response.data.url;
+  element.uploadFlag = true;
 }
 
 //
 const transferDataSourceOptions = [
-	{
-		value: '数据源',
-		label: '数据源',
-	},
-	{
-		value: '固定选项',
-		label: '固定选项',
-	},
-]
+  {
+    value: "数据源",
+    label: "数据源",
+  },
+  {
+    value: "固定选项",
+    label: "固定选项",
+  },
+];
 
 //const radio = ref(controlData.value.control.fit)
 
 //liwenxuan20240313 lowcodeImage end
 
-
-//liwenxuan20240403 associatedForms start 
-import AssociatedFormsTinyace from '@/widget/associatedforms/associatedFormsTinyace.vue'
-import AssociatedFormsTinyaceRange from '@/widget/associatedforms/associatedFormsTinyaceRange.vue'
-import AssociatedFormsFillRole from '@/widget/associatedforms/associatedFormsFillRole.vue'
-import AssociatedFormsChildFillRole from '@/widget/associatedforms/associatedFormsChildFillRole.vue'
+//liwenxuan20240403 associatedForms start
+import AssociatedFormsTinyace from "@/widget/associatedforms/associatedFormsTinyace.vue";
+import AssociatedFormsTinyaceRange from "@/widget/associatedforms/associatedFormsTinyaceRange.vue";
+import AssociatedFormsFillRole from "@/widget/associatedforms/associatedFormsFillRole.vue";
+import AssociatedFormsChildFillRole from "@/widget/associatedforms/associatedFormsChildFillRole.vue";
 
 const treeDefaultProps = {
-	children: 'children',
-	label: 'label',
-}
+  children: "children",
+  label: "label",
+};
 //拿到子组件AssociatedFormsTinyace的实例
 const aft = ref();
 const aftRange = ref();
 
 function getAssociatedFormsCurrentFieldTree() {
-
-        return request({ 
-            url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-            method: 'post',
-			data: {
-				//cfid:'13'
-                cfid:props.customerformid
-			},
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: props.customerformid,
+    },
+  });
 }
 
 function getAssociatedFormsOrgAndManTree() {
-        return request({
-            url: '/javasys/lowCode/transfer/getOrgAndManTree',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/transfer/getOrgAndManTree",
+    method: "post",
+  });
 }
 
 function getCustomerFormList() {
-        return request({
-            url: '/javasys/lowCode/AssociatedForms/getCustomerFormList',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getCustomerFormList",
+    method: "post",
+  });
 }
 function getAssociatedFormsRoleTree() {
-        return request({
-            url: '/javasys/lowCode/AssociatedForms/getRoleList',
-            method: 'post',
-        });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getRoleList",
+    method: "post",
+  });
 }
 
 function getAsfasfFieldTree() {
-    return request({ 
-        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-        method: 'post',
-        data: {
-            //cfid:'13'
-            cfid:controlData.value.control.formid
-        },
-    });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: controlData.value.control.formid,
+    },
+  });
 }
 
 function getAsfasfFieldTreeOptionsValue3() {
-    return request({ 
-        url: '/javasys/lowCode/AssociatedForms/getFieldTree',
-        method: 'post',
-        data: {
-            //cfid:'13'
-            cfid:controlData.value.control.optionsValue3Formid
-        },
-    });
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getFieldTree",
+    method: "post",
+    data: {
+      //cfid:'13'
+      cfid: controlData.value.control.optionsValue3Formid,
+    },
+  });
 }
 
 //
-const asfasfFieldTree = ref<Tree[]>()
-
-const asfasfMasterFieldTree = ref<Tree[]>()
+const asfasfFieldTree = ref<Tree[]>();
 
-const asfasfChildTableList = ref<Tree[]>()
+const asfasfMasterFieldTree = ref<Tree[]>();
 
-const asfasfChildTableFields = ref<Tree[]>()
+const asfasfChildTableList = ref<Tree[]>();
 
-const asfasfFieldTreeOptionsValue3 = ref<Tree[]>()
-
-let currentChildTableCount = 0
-
-function removeFirstNumElements(arr: string | any[],num:number) {
-    if (arr.length < num) {
-        return [];
-    }
-    return arr.slice(num);
-}
+const asfasfChildTableFields = ref<Tree[]>();
 
-function formidChanged(){
+const asfasfFieldTreeOptionsValue3 = ref<Tree[]>();
 
-    //需设置关联关联表单的表单
-    controlData.value.control.glbbddbd=formData.value.name
-    if(controlData.value.control.formid===''){
+let currentChildTableCount = 0;
 
-    }else{
-        getAsfasfFieldTree().then(({ data }) => {
-            
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-                let resData = ref(data.children)
-                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children))
-                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
-                //console.log(dataExceptChild)
-                dataExceptChild = removeFirstNumElements(dataExceptChild,8);
-                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
-                dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table');
-                //console.log(dataOnlyChild1)
-                dataOnlyChild1.forEach((element: any) => {
-                    element.children = removeFirstNumElements(element.children,6);
-                });
-                /* console.log(dataOnlyChild1)
-                console.log(dataOnlyChild) */
-                for(let m = 0;m<dataOnlyChild.length;m++){
-                    dataOnlyChild[m].children = []
-                }
-                let resDataExceptChild = ref(dataExceptChild)
-                let resDataOnlyChild = ref(dataOnlyChild)
-                let resDataOnlyChild1 = ref(dataOnlyChild1)
-                //console.log(resDataOnlyChild1.value)
-                //console.log(resDataOnlyChild.value)
-                let childTableCount = 0
-                for(let n = 0;n<resDataOnlyChild.value.length;n++){
-                    //console.log(resDataOnlyChild.value[n])
-                    resDataOnlyChild.value[n].disabled=false
-                    childTableCount++
-                }
-                //console.log(childTableCount)
-                currentChildTableCount = childTableCount
-                asfasfFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfMasterFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataExceptChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableList.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableFields.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild1.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-            }
-            controlData.value.control.asfasfLabel = data.label
-        });
-    }
-    
+function removeFirstNumElements(arr: string | any[], num: number) {
+  if (arr.length < num) {
+    return [];
+  }
+  return arr.slice(num);
 }
 
-function formidChangedOptionsValue3(){
-    if(controlData.value.control.optionsValue3Formid===''){
-
-    }else{
-        getAsfasfFieldTreeOptionsValue3().then(({ data }) => {
-            
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-
-                if(data.treeAttrs.onlyToShowTableId==""){//当前选中的是主表
-                    let resData = ref(data.children)
-                    //let rootid_ = data.value.label
-                    asfasfFieldTreeOptionsValue3.value = [{
-                        id: 'rootid_'+data.label,
-                        label: '关联的表单-'+data.label,
-                        children: [...resData.value],
-                        treeAttrs: data.treeAttrs,
-                    }]
-                }else{//当前选中的是子表
-                    let resData = ref(data.children)
-                    resData.value = resData.value.filter((item: { children: null }) => item.children != null)
-                    let arr = JSON.parse(JSON.stringify(resData.value));
-                    arr = arr.filter( (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId )
-                
-                    arr = arr[0].children
-                    // console.log(arr)
-                    asfasfFieldTreeOptionsValue3.value = [{
-                        id: 'rootid_'+data.label,
-                        label: '关联的表单-'+data.label,
-                        children: [...arr],
-                        treeAttrs: data.treeAttrs,
-                    }]
-                    
-                    
-                }
-                let optionsValue3Formid = controlData.value.control.optionsValue3Formid
-                let str_optionsValue3Formid = optionsValue3Formid.split(":")[0]
-                let optionsValue3Field = controlData.value.control.optionsValue3Field
-                let str_optionsValue3Field = optionsValue3Field.split(":")[1]
-                //alert(str_optionsValue3Field)
-                if(typeof(str_optionsValue3Field)!='undefined'){
-                    if(str_optionsValue3Formid!=str_optionsValue3Field){
-                        controlData.value.control.optionsValue3Field = ""
-                    }else{
-                        if(optionsValue3Formid.includes(":zibiaoid-")){
-                            let zibiaoid = optionsValue3Formid.split(":zibiaoid-")[1]
-                            if(!optionsValue3Field.includes(zibiaoid)){
-                                controlData.value.control.optionsValue3Field = ""
-                            }
-                        }
-                    }
-
-                    
-                }
-                
-                
-            }
-            
-        });
-    }
-}
-let currentFormChildTableFieldsForFillRole = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTree = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTree1 = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>()
-let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>()
-let resDataForGlxxszExceptself: any[] = []
-let resDataForGlxxszExceptself1: any[] = []
-let getAssociatedFormsCurrentFieldTreeData:any
-getAssociatedFormsCurrentFieldTree1()
-function getAssociatedFormsCurrentFieldTree1(){
-getAssociatedFormsCurrentFieldTree().then(({ data }) => {
-    // console.log(data)
-    getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data))
-    // console.log(getAssociatedFormsCurrentFieldTreeData)
-    if(data.id==="cfid为空"||data.id==="masterTable为null"){
-        
+function formidChanged() {
+  //需设置关联关联表单的表单
+  controlData.value.control.glbbddbd = formData.value.name;
+  if (controlData.value.control.formid === "") {
+  } else {
+    getAsfasfFieldTree().then(({ data }) => {
+      if (data.id === "cfid为空") {
         //alert("cfid为空")
-    }else{
-        
-        let resData = ref(data.children)
-        let resDataExceptSystemFields = JSON.parse(JSON.stringify(data.children))
-        let currentFormChildTableFields = JSON.parse(JSON.stringify(data.children))
-        let resDataNoTable = JSON.parse(JSON.stringify(data.children))
-        
-        resDataExceptSystemFields = removeFirstNumElements(resDataExceptSystemFields,8)
-        resDataExceptSystemFields.forEach((element: any)  => {
-            if(element.type=="table"){
-                //console.log(element)
-                element.children = removeFirstNumElements(element.children,6)
-            }
-        });
-        //在此组装当前表单子表字段数据
-        currentFormChildTableFields = currentFormChildTableFields.filter( (item: { type: string }) => item.type == "table" )
-        currentFormChildTableFields.forEach((element: any) => {
-            element.children = removeFirstNumElements(element.children,6)
+      } else {
+        let resData = ref(data.children);
+        let dataExceptChild = JSON.parse(JSON.stringify(data.children));
+        let dataOnlyChild = JSON.parse(JSON.stringify(data.children));
+        let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children));
+        dataExceptChild = dataExceptChild.filter(
+          (obj: { type: string }) => obj.type !== "table"
+        );
+        //console.log(dataExceptChild)
+        dataExceptChild = removeFirstNumElements(dataExceptChild, 8);
+        dataOnlyChild = dataOnlyChild.filter(
+          (obj: { type: string }) => obj.type == "table"
+        );
+        dataOnlyChild1 = dataOnlyChild1.filter(
+          (obj: { type: string }) => obj.type == "table"
+        );
+        //console.log(dataOnlyChild1)
+        dataOnlyChild1.forEach((element: any) => {
+          element.children = removeFirstNumElements(element.children, 6);
         });
-        
-        associatedFormsCurrentFormFieldTree.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
+        /* console.log(dataOnlyChild1)
+                console.log(dataOnlyChild) */
+        for (let m = 0; m < dataOnlyChild.length; m++) {
+          dataOnlyChild[m].children = [];
+        }
+        let resDataExceptChild = ref(dataExceptChild);
+        let resDataOnlyChild = ref(dataOnlyChild);
+        let resDataOnlyChild1 = ref(dataOnlyChild1);
+        //console.log(resDataOnlyChild1.value)
+        //console.log(resDataOnlyChild.value)
+        let childTableCount = 0;
+        for (let n = 0; n < resDataOnlyChild.value.length; n++) {
+          //console.log(resDataOnlyChild.value[n])
+          resDataOnlyChild.value[n].disabled = false;
+          childTableCount++;
+        }
+        //console.log(childTableCount)
+        currentChildTableCount = childTableCount;
+        asfasfFieldTree.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
             children: [...resData.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        associatedFormsCurrentFormFieldTree1.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataExceptSystemFields],
+          },
+        ];
+        asfasfMasterFieldTree.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataExceptChild.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        currentFormChildTableFieldsForFillRole.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...currentFormChildTableFields],
+          },
+        ];
+        asfasfChildTableList.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataOnlyChild.value],
             treeAttrs: data.treeAttrs,
             disabled: true,
-        }]
-        
-        resDataNoTable = resDataNoTable.filter((item: { type: string | null }) => item.type!="table")
-        
-        associatedFormsCurrentFormFieldTreeNoTable.value = [{
-            id: 'rootid_'+data.label,
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataNoTable],
-            treeAttrs: data.treeAttrs,
-        }]
-
-        let resDataForGlxxsz = ref(data.children.slice(8))
-        
-        resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
-        
-        
-        
-        
-        
-        associatedFormsCurrentFormFieldTreeForGlxxsz.value = [{
-            id: 'rootid_'+data.label,
-            //label: '当前表单',
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataForGlxxsz.value],
+          },
+        ];
+        asfasfChildTableFields.value = [
+          {
+            id: "rootid_" + data.label,
+            label: "关联的表单-" + data.label,
+            children: [...resDataOnlyChild1.value],
             treeAttrs: data.treeAttrs,
-        }]
-        associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [{
-            id: 'rootid_'+data.label,
-            //label: '当前表单',
-            label: '当前表单-'+data.treeAttrs.show,
-            children: [...resDataForGlxxsz.value],
-            treeAttrs: data.treeAttrs,//getAssociatedFormsCurrentFieldTreeData
-        }]
-
-        
-    }
-});
+            disabled: true,
+          },
+        ];
+      }
+      controlData.value.control.asfasfLabel = data.label;
+    });
+  }
+}
+
+function formidChangedOptionsValue3() {
+  if (controlData.value.control.optionsValue3Formid === "") {
+  } else {
+    getAsfasfFieldTreeOptionsValue3().then(({ data }) => {
+      if (data.id === "cfid为空") {
+        //alert("cfid为空")
+      } else {
+        if (data.treeAttrs.onlyToShowTableId == "") {
+          //当前选中的是主表
+          let resData = ref(data.children);
+          //let rootid_ = data.value.label
+          asfasfFieldTreeOptionsValue3.value = [
+            {
+              id: "rootid_" + data.label,
+              label: "关联的表单-" + data.label,
+              children: [...resData.value],
+              treeAttrs: data.treeAttrs,
+            },
+          ];
+        } else {
+          //当前选中的是子表
+          let resData = ref(data.children);
+          resData.value = resData.value.filter(
+            (item: { children: null }) => item.children != null
+          );
+          let arr = JSON.parse(JSON.stringify(resData.value));
+          arr = arr.filter(
+            (item: { label: any }) => item.label == data.treeAttrs.onlyToShowTableId
+          );
+
+          arr = arr[0].children;
+          // console.log(arr)
+          asfasfFieldTreeOptionsValue3.value = [
+            {
+              id: "rootid_" + data.label,
+              label: "关联的表单-" + data.label,
+              children: [...arr],
+              treeAttrs: data.treeAttrs,
+            },
+          ];
+        }
+        let optionsValue3Formid = controlData.value.control.optionsValue3Formid;
+        let str_optionsValue3Formid = optionsValue3Formid.split(":")[0];
+        let optionsValue3Field = controlData.value.control.optionsValue3Field;
+        let str_optionsValue3Field = optionsValue3Field.split(":")[1];
+        //alert(str_optionsValue3Field)
+        if (typeof str_optionsValue3Field != "undefined") {
+          if (str_optionsValue3Formid != str_optionsValue3Field) {
+            controlData.value.control.optionsValue3Field = "";
+          } else {
+            if (optionsValue3Formid.includes(":zibiaoid-")) {
+              let zibiaoid = optionsValue3Formid.split(":zibiaoid-")[1];
+              if (!optionsValue3Field.includes(zibiaoid)) {
+                controlData.value.control.optionsValue3Field = "";
+              }
+            }
+          }
+        }
+      }
+    });
+  }
 }
+let currentFormChildTableFieldsForFillRole = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTree = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTree1 = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeNoTable = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeForGlxxsz = ref<Tree[]>();
+let associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf = ref<Tree[]>();
+let resDataForGlxxszExceptself: any[] = [];
+let resDataForGlxxszExceptself1: any[] = [];
+let getAssociatedFormsCurrentFieldTreeData: any;
+getAssociatedFormsCurrentFieldTree1();
+function getAssociatedFormsCurrentFieldTree1() {
+  getAssociatedFormsCurrentFieldTree().then(({ data }) => {
+    // console.log(data)
+    getAssociatedFormsCurrentFieldTreeData = JSON.parse(JSON.stringify(data));
+    // console.log(getAssociatedFormsCurrentFieldTreeData)
+    if (data.id === "cfid为空" || data.id === "masterTable为null") {
+      //alert("cfid为空")
+    } else {
+      let resData = ref(data.children);
+      let resDataExceptSystemFields = JSON.parse(JSON.stringify(data.children));
+      let currentFormChildTableFields = JSON.parse(JSON.stringify(data.children));
+      let resDataNoTable = JSON.parse(JSON.stringify(data.children));
+
+      resDataExceptSystemFields = removeFirstNumElements(resDataExceptSystemFields, 8);
+      resDataExceptSystemFields.forEach((element: any) => {
+        if (element.type == "table") {
+          //console.log(element)
+          element.children = removeFirstNumElements(element.children, 6);
+        }
+      });
+      //在此组装当前表单子表字段数据
+      currentFormChildTableFields = currentFormChildTableFields.filter(
+        (item: { type: string }) => item.type == "table"
+      );
+      currentFormChildTableFields.forEach((element: any) => {
+        element.children = removeFirstNumElements(element.children, 6);
+      });
+
+      associatedFormsCurrentFormFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resData.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      associatedFormsCurrentFormFieldTree1.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataExceptSystemFields],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      currentFormChildTableFieldsForFillRole.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...currentFormChildTableFields],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
 
+      resDataNoTable = resDataNoTable.filter(
+        (item: { type: string | null }) => item.type != "table"
+      );
 
-const customerFormTree = ref<Tree[]>()
-getCustomerFormList().then(({ data }) => {   
-    let resData = ref(data.children)
-	customerFormTree.value = [{
-        id: data.id,
-        //value: data.value,
-    	//label: data.label,
-		label: '请选择表单',
-        children: [...resData.value]
-    }]
-});
+      associatedFormsCurrentFormFieldTreeNoTable.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataNoTable],
+          treeAttrs: data.treeAttrs,
+        },
+      ];
+
+      let resDataForGlxxsz = ref(data.children.slice(8));
+
+      resDataForGlxxszExceptself = JSON.parse(JSON.stringify(resDataForGlxxsz.value));
+
+      associatedFormsCurrentFormFieldTreeForGlxxsz.value = [
+        {
+          id: "rootid_" + data.label,
+          //label: '当前表单',
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataForGlxxsz.value],
+          treeAttrs: data.treeAttrs,
+        },
+      ];
+      associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf.value = [
+        {
+          id: "rootid_" + data.label,
+          //label: '当前表单',
+          label: "当前表单-" + data.treeAttrs.show,
+          children: [...resDataForGlxxsz.value],
+          treeAttrs: data.treeAttrs, //getAssociatedFormsCurrentFieldTreeData
+        },
+      ];
+    }
+  });
+}
 
+const customerFormTree = ref<Tree[]>();
+getCustomerFormList().then(({ data }) => {
+  let resData = ref(data.children);
+  customerFormTree.value = [
+    {
+      id: data.id,
+      //value: data.value,
+      //label: data.label,
+      label: "请选择表单",
+      children: [...resData.value],
+    },
+  ];
+});
 
-const orgAndManTree = ref<Tree[]>()
-getAssociatedFormsOrgAndManTree().then(({ data }) => {   
-    let resData = ref(data.children)
-	orgAndManTree.value = [{
-        id: data.id,
-    	//label: data.label,
-		label: '组织机构',
-        children: [...resData.value]
-    }]
+const orgAndManTree = ref<Tree[]>();
+getAssociatedFormsOrgAndManTree().then(({ data }) => {
+  let resData = ref(data.children);
+  orgAndManTree.value = [
+    {
+      id: data.id,
+      //label: data.label,
+      label: "组织机构",
+      children: [...resData.value],
+    },
+  ];
 });
 
-const roleTree = ref<Tree[]>()
-getAssociatedFormsRoleTree().then(({ data }) => {   
-    let resData = ref(data.children)
-    // console.log("roleTree=============="+resData.value);
-	roleTree.value = [{
-        id: data.id,
-    	//label: data.label,
-		label: '角色',
-        children: [...resData.value]
-    }]
+const roleTree = ref<Tree[]>();
+getAssociatedFormsRoleTree().then(({ data }) => {
+  let resData = ref(data.children);
+  // console.log("roleTree=============="+resData.value);
+  roleTree.value = [
+    {
+      id: data.id,
+      //label: data.label,
+      label: "角色",
+      children: [...resData.value],
+    },
+  ];
 });
 //    field
-const fieldTreeSearchFlag = ref(false)
+const fieldTreeSearchFlag = ref(false);
 
-function handleFieldTreeExpand(){
-	
-	fieldTreeSearchFlag.value = true;
+function handleFieldTreeExpand() {
+  fieldTreeSearchFlag.value = true;
 }
 
-function handleFieldTreeCollapse(){
-	
-	fieldTreeSearchFlag.value = false;
+function handleFieldTreeCollapse() {
+  fieldTreeSearchFlag.value = false;
 }
 
-
-function handleFieldTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon_field(object)
+function handleFieldTreeContextmenu(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aft.value.addIcon_field(object);
 }
-function handleFieldTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon_field(object)
+function handleFieldTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon_field(object);
 }
 
-
-
 //org
-const orgTreeSearchFlag = ref(false)
+const orgTreeSearchFlag = ref(false);
 
-function handleOrgTreeExpand(){
-	
-	orgTreeSearchFlag.value = true;
+function handleOrgTreeExpand() {
+  orgTreeSearchFlag.value = true;
 }
 
-function handleOrgTreeCollapse(){
-	
-	orgTreeSearchFlag.value = false;
+function handleOrgTreeCollapse() {
+  orgTreeSearchFlag.value = false;
 }
 
-function handleOrgTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon_org(object)
+function handleOrgTreeContextmenu(MouseEvent: any, object: any, Node: any, element: any) {
+  aft.value.addIcon_org(object);
 }
-function handleOrgTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon_org(object)
+function handleOrgTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon_org(object);
 }
 //role
-const roleTreeSearchFlag = ref(false)
+const roleTreeSearchFlag = ref(false);
 
-function handleRoleTreeExpand(){
-	
-	roleTreeSearchFlag.value = true;
+function handleRoleTreeExpand() {
+  roleTreeSearchFlag.value = true;
 }
 
-function handleRoleTreeCollapse(){
-	
-	roleTreeSearchFlag.value = false;
+function handleRoleTreeCollapse() {
+  roleTreeSearchFlag.value = false;
 }
 
-function handleRoleTreeContextmenu(MouseEvent:any, object:any, Node:any, element:any){
-    aft.value.addIcon(object)
+function handleRoleTreeContextmenu(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aft.value.addIcon(object);
 }
-function handleRoleTreeContextmenuRange(MouseEvent:any, object:any, Node:any, element:any){
-    aftRange.value.addIcon(object)
+function handleRoleTreeContextmenuRange(
+  MouseEvent: any,
+  object: any,
+  Node: any,
+  element: any
+) {
+  aftRange.value.addIcon(object);
 }
 
+import { ElTree } from "element-plus";
 
-import { ElTree } from 'element-plus'
-
-
-const fieldTreeFilterText = ref('')
-const orgTreeFilterText = ref('')
-const roleTreeFilterText = ref('')
-const fieldTreeRef = ref<InstanceType<typeof ElTree>>()
-const orgTreeRef = ref<InstanceType<typeof ElTree>>()
-const roleTreeRef = ref<InstanceType<typeof ElTree>>()
+const fieldTreeFilterText = ref("");
+const orgTreeFilterText = ref("");
+const roleTreeFilterText = ref("");
+const fieldTreeRef = ref<InstanceType<typeof ElTree>>();
+const orgTreeRef = ref<InstanceType<typeof ElTree>>();
+const roleTreeRef = ref<InstanceType<typeof ElTree>>();
 watch(fieldTreeFilterText, (val) => {
-	fieldTreeRef.value!.filter(val)
-})
+  fieldTreeRef.value!.filter(val);
+});
 watch(orgTreeFilterText, (val) => {
-	orgTreeRef.value!.filter(val)
-})
+  orgTreeRef.value!.filter(val);
+});
 watch(roleTreeFilterText, (val) => {
-	roleTreeRef.value!.filter(val)
-})
+  roleTreeRef.value!.filter(val);
+});
 
 const filterNode = (value: string, associatedFormsCurrentFormFieldTree: Tree) => {
-	if (!value) return true
-	return associatedFormsCurrentFormFieldTree.label.includes(value)
-}
+  if (!value) return true;
+  return associatedFormsCurrentFormFieldTree.label.includes(value);
+};
 
 //关联表单隐藏条件弹窗flag
-const associatedFormsHideDialogFlag = ref(false)
-
-const associatedFormsDataRangeDialogFlag = ref(false)
-
-
-
+const associatedFormsHideDialogFlag = ref(false);
 
+const associatedFormsDataRangeDialogFlag = ref(false);
 
 //点击开启隐藏设置
-function associatedFormsHideDialoghandle(){
-
-        associatedFormsHideDialogFlag.value = true
-        controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
-        nextTick(() => {
-            aft.value.focusEditor()
-        })
-    
+function associatedFormsHideDialoghandle() {
+  associatedFormsHideDialogFlag.value = true;
+  controlData.value.control.hideConditionHtmlCopy =
+    controlData.value.control.hideConditionHtml;
+  nextTick(() => {
+    aft.value.focusEditor();
+  });
 }
 
-
-
-function associatedFormsDataRangeDialoghandle(){
-
-        getAsfasfFieldTree().then(({ data }) => {
-    
-            if(data.id==="cfid为空"){
-                //alert("cfid为空")
-            }else{
-                let resData = ref(data.children)
-                let dataExceptChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild = JSON.parse(JSON.stringify(data.children))
-                let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children))
-                dataExceptChild = dataExceptChild.filter((obj: { type: string }) => obj.type!== 'table');
-                //console.log(dataExceptChild)
-                dataExceptChild = removeFirstNumElements(dataExceptChild,8);
-                dataOnlyChild = dataOnlyChild.filter((obj: { type: string }) => obj.type== 'table');
-                dataOnlyChild1 = dataOnlyChild1.filter((obj: { type: string }) => obj.type== 'table');
-                //console.log(dataOnlyChild1)
-                dataOnlyChild1.forEach((element: any) => {
-                    element.children = removeFirstNumElements(element.children,6);
-                });
-                /* console.log(dataOnlyChild1)
+function associatedFormsDataRangeDialoghandle() {
+  getAsfasfFieldTree().then(({ data }) => {
+    if (data.id === "cfid为空") {
+      //alert("cfid为空")
+    } else {
+      let resData = ref(data.children);
+      let dataExceptChild = JSON.parse(JSON.stringify(data.children));
+      let dataOnlyChild = JSON.parse(JSON.stringify(data.children));
+      let dataOnlyChild1 = JSON.parse(JSON.stringify(data.children));
+      dataExceptChild = dataExceptChild.filter(
+        (obj: { type: string }) => obj.type !== "table"
+      );
+      //console.log(dataExceptChild)
+      dataExceptChild = removeFirstNumElements(dataExceptChild, 8);
+      dataOnlyChild = dataOnlyChild.filter(
+        (obj: { type: string }) => obj.type == "table"
+      );
+      dataOnlyChild1 = dataOnlyChild1.filter(
+        (obj: { type: string }) => obj.type == "table"
+      );
+      //console.log(dataOnlyChild1)
+      dataOnlyChild1.forEach((element: any) => {
+        element.children = removeFirstNumElements(element.children, 6);
+      });
+      /* console.log(dataOnlyChild1)
                 console.log(dataOnlyChild) */
-                for(let m = 0;m<dataOnlyChild.length;m++){
-                    dataOnlyChild[m].children = []
-                }
-                let resDataExceptChild = ref(dataExceptChild)
-                let resDataOnlyChild = ref(dataOnlyChild)
-                let resDataOnlyChild1 = ref(dataOnlyChild1)
-                //console.log(resDataOnlyChild1.value)
-                //console.log(asfasfChildTableList.value)
-                //console.log(resDataOnlyChild.value)
-                let childTableCount = 0
-                for(let n = 0;n<resDataOnlyChild.value.length;n++){
-                    //console.log(resDataOnlyChild.value[n])
-                    resDataOnlyChild.value[n].disabled=false
-                    childTableCount = n;
-                }
-                //console.log(childTableCount)
-                currentChildTableCount = childTableCount
-                asfasfFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resData.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfMasterFieldTree.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataExceptChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableList.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-                asfasfChildTableFields.value = [{
-                    id: 'rootid_'+data.label,
-                    label: '关联的表单-'+data.label,
-                    children: [...resDataOnlyChild1.value],
-                    treeAttrs: data.treeAttrs,
-                    disabled:true,
-                }]
-            }
-        });
-
-
+      for (let m = 0; m < dataOnlyChild.length; m++) {
+        dataOnlyChild[m].children = [];
+      }
+      let resDataExceptChild = ref(dataExceptChild);
+      let resDataOnlyChild = ref(dataOnlyChild);
+      let resDataOnlyChild1 = ref(dataOnlyChild1);
+      //console.log(resDataOnlyChild1.value)
+      //console.log(asfasfChildTableList.value)
+      //console.log(resDataOnlyChild.value)
+      let childTableCount = 0;
+      for (let n = 0; n < resDataOnlyChild.value.length; n++) {
+        //console.log(resDataOnlyChild.value[n])
+        resDataOnlyChild.value[n].disabled = false;
+        childTableCount = n;
+      }
+      //console.log(childTableCount)
+      currentChildTableCount = childTableCount;
+      asfasfFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resData.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfMasterFieldTree.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataExceptChild.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfChildTableList.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataOnlyChild.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+      asfasfChildTableFields.value = [
+        {
+          id: "rootid_" + data.label,
+          label: "关联的表单-" + data.label,
+          children: [...resDataOnlyChild1.value],
+          treeAttrs: data.treeAttrs,
+          disabled: true,
+        },
+      ];
+    }
+  });
 
-        associatedFormsDataRangeDialogFlag.value = true
-        controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
-        
-        nextTick(() => {
-            aftRange.value.focusEditor()
-        })
+  associatedFormsDataRangeDialogFlag.value = true;
+  controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
 
+  nextTick(() => {
+    aftRange.value.focusEditor();
+  });
 }
 
 //自定义事件同步父子组件的text
-function aftTextChanged(str:string){
-    controlData.value.control.hideConditionHtml = str
+function aftTextChanged(str: string) {
+  controlData.value.control.hideConditionHtml = str;
 }
 
-function aftGongshiChanged(gongshi:any){
-    controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml
-    controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula
-    controlData.value.control.hideGongShi.mathsString = gongshi.mathsString
+function aftGongshiChanged(gongshi: any) {
+  controlData.value.control.hideGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.hideGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.hideGongShi.mathsString = gongshi.mathsString;
 }
 
-function aftTextChangedRange(str:string){
-    controlData.value.control.dataRangeConditionHtml = str
+function aftTextChangedRange(str: string) {
+  controlData.value.control.dataRangeConditionHtml = str;
 }
-function aftGongshiChangedRange(gongshi:any){
-    controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml
-    controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula
-    controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString
+function aftGongshiChangedRange(gongshi: any) {
+  controlData.value.control.dataRangeGongShi.formulaHtml = gongshi.formulaHtml;
+  controlData.value.control.dataRangeGongShi.mathsFormula = gongshi.mathsFormula;
+  controlData.value.control.dataRangeGongShi.mathsString = gongshi.mathsString;
 }
 //asf隐藏条件取消编辑
-function asfhTextCancel(){
-    determine.value = false
-    associatedFormsHideDialogFlag.value = false
-    controlData.value.control.hideConditionHtml = controlData.value.control.hideConditionHtmlCopy
-    //父组件取消将copy同步至子组件
-    aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy)
+function asfhTextCancel() {
+  determine.value = false;
+  associatedFormsHideDialogFlag.value = false;
+  controlData.value.control.hideConditionHtml =
+    controlData.value.control.hideConditionHtmlCopy;
+  //父组件取消将copy同步至子组件
+  aft.value.handelCancel(controlData.value.control.hideConditionHtmlCopy);
 }
 
-function asfhTextCancelRange(){
-    determineRange.value = false
-    associatedFormsDataRangeDialogFlag.value = false
-    controlData.value.control.dataRangeConditionHtml = controlData.value.control.dataRangeConditionHtmlCopy
-    //父组件取消将copy同步至子组件
-    aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy)
+function asfhTextCancelRange() {
+  determineRange.value = false;
+  associatedFormsDataRangeDialogFlag.value = false;
+  controlData.value.control.dataRangeConditionHtml =
+    controlData.value.control.dataRangeConditionHtmlCopy;
+  //父组件取消将copy同步至子组件
+  aftRange.value.handelCancel(controlData.value.control.dataRangeConditionHtmlCopy);
 }
 
 //上次点击了确定为true
-let determine = ref(true)
-let determineRange = ref(true)
+let determine = ref(true);
+let determineRange = ref(true);
 //监听associatedFormsHideDialogFlag true 重新init  tinymce
 watch(associatedFormsHideDialogFlag, (val) => {
-	if(val===true&&determine.value===false){
-        setTimeout(() => {
-            //alert(1)
-            aft.value.tinymceReInit()
-        }, 200);
-    }
-})
+  if (val === true && determine.value === false) {
+    setTimeout(() => {
+      //alert(1)
+      aft.value.tinymceReInit();
+    }, 200);
+  }
+});
 
 watch(associatedFormsDataRangeDialogFlag, (val) => {
-	if(val===true&&determineRange.value===false){
-        setTimeout(() => {
-            //alert(2)
-            aftRange.value.tinymceReInit()
-        }, 200);
-    }
-})
+  if (val === true && determineRange.value === false) {
+    setTimeout(() => {
+      //alert(2)
+      aftRange.value.tinymceReInit();
+    }, 200);
+  }
+});
 //关联表单数据填充规则根据已选择子表的数目和id将已选择的子表置为不可选择
-function selectedOrDelChildRole(){
-    
-    //console.log(asfasfChildTableList.value)
-    //console.log(controlData.value.control?.fillRoles?.child)
-    let selectedArr: any[] = []
-    controlData.value.control?.fillRoles?.child.forEach(function(item: any) {
-        if(item.asfChildTableKey!=""){
-            selectedArr.push(item)
+function selectedOrDelChildRole() {
+  //console.log(asfasfChildTableList.value)
+  //console.log(controlData.value.control?.fillRoles?.child)
+  let selectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.child.forEach(function (item: any) {
+    if (item.asfChildTableKey != "") {
+      selectedArr.push(item);
+    }
+  });
+  //console.log(selectedArr)
+  if (asfasfChildTableList.value) {
+    asfasfChildTableList.value[0].children?.forEach(function (item: any) {
+      item.disabled = false;
+    });
+  }
+  if (asfasfChildTableList.value) {
+    asfasfChildTableList.value[0].children?.forEach(function (item: any) {
+      selectedArr.forEach(function (i: any) {
+        if (i.asfChildTableKey == item.id) {
+          item.disabled = true;
         }
+      });
     });
-    //console.log(selectedArr)
-    if(asfasfChildTableList.value){
-        asfasfChildTableList.value[0].children?.forEach(function(item: any){   
-            item.disabled=false
-        })
-    }
-    if(asfasfChildTableList.value){
-        asfasfChildTableList.value[0].children?.forEach(function(item: any){   
-            selectedArr.forEach(function(i: any){
-                if(i.asfChildTableKey==item.id){
-                    item.disabled=true
-                }
-            })
-        })
-    }
-    
+  }
 }
-//将已被选择的要填充的关联其他表单的表单的子表字段设为不可选择              
-function childRoleRightChanged(){
-    
-    let selectedArr: any[] = []
-    let otherMasterSelectedArr: any[] = []
-    let otherChildSelectedArr: any[] = []
-    asfsExpectCurrent.forEach(function(item: any) {
-        let master = item.control.fillRoles.master
-        let child = item.control.fillRoles.child
-        /* console.log(master)
+//将已被选择的要填充的关联其他表单的表单的子表字段设为不可选择
+function childRoleRightChanged() {
+  let selectedArr: any[] = [];
+  let otherMasterSelectedArr: any[] = [];
+  let otherChildSelectedArr: any[] = [];
+  asfsExpectCurrent.forEach(function (item: any) {
+    let master = item.control.fillRoles.master;
+    let child = item.control.fillRoles.child;
+    /* console.log(master)
         console.log(child) */
-        master.forEach(function(item: any) {
-            if(item.rightValue!=""){
-                otherMasterSelectedArr.push(item)
-            }
-        });
-        child.forEach(function(item: any) {
-            item.childRoles.forEach((element: any) => {
-                if(element.rightValue!=""){
-                    otherChildSelectedArr.push(element)
-                }
-            });
-        });
+    master.forEach(function (item: any) {
+      if (item.rightValue != "") {
+        otherMasterSelectedArr.push(item);
+      }
     });
-    let masterSelectedArr: any[] = []
-    controlData.value.control?.fillRoles?.master.forEach(function(item: any) {
-        if(item.rightValue!=""){
-            masterSelectedArr.push(item)
+    child.forEach(function (item: any) {
+      item.childRoles.forEach((element: any) => {
+        if (element.rightValue != "") {
+          otherChildSelectedArr.push(element);
         }
+      });
     });
-    let childSelectedArr: any[] = []
-    controlData.value.control?.fillRoles?.child.forEach(function(item: any) {
-        item.childRoles.forEach((element: any) => {
-            if(element.rightValue!=""){
-                childSelectedArr.push(element)
-            }
-        });
+  });
+  let masterSelectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.master.forEach(function (item: any) {
+    if (item.rightValue != "") {
+      masterSelectedArr.push(item);
+    }
+  });
+  let childSelectedArr: any[] = [];
+  controlData.value.control?.fillRoles?.child.forEach(function (item: any) {
+    item.childRoles.forEach((element: any) => {
+      if (element.rightValue != "") {
+        childSelectedArr.push(element);
+      }
     });
+  });
 
-    /* 1.得到当前子表填充规则块在所有子表填充规则块数组中的index
+  /* 1.得到当前子表填充规则块在所有子表填充规则块数组中的index
     2.得到所有index在当前子表填充规则块之前的子表填充规则块
     3.得到2中所有right,凡是出现过的子表,就把这些子表的所有选项全部置为不可选 */
-    //console.log(asfs)
-
-
-    selectedArr.push(...otherMasterSelectedArr)
-    selectedArr.push(...otherChildSelectedArr)
-    selectedArr.push(...masterSelectedArr)
-    selectedArr.push(...childSelectedArr)
-    //主表控制 start
-    if(associatedFormsCurrentFormFieldTree1.value){
-        associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){
-            if(item.type=="table"){
-                item.children.forEach((element: any) => {
-                    element.disabled = false
-                });
-            }else{
-                item.disabled = false
-            }
-            
-        })
-    }
-    if(associatedFormsCurrentFormFieldTree1.value){
-        associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function(item: any){
-            if(item.type=="table"){
-                item.children.forEach((element: any) => {
-                    selectedArr.forEach((j:any) => {
-                        if(j.rightValue==element.id){
-                            element.disabled = true
-                        }
-                    })
-                });
-            }else{
-                selectedArr.forEach((element:any) => {
-                    if(element.rightValue==item.id){
-                        item.disabled = true
-                    }
-                })
+  //console.log(asfs)
+
+  selectedArr.push(...otherMasterSelectedArr);
+  selectedArr.push(...otherChildSelectedArr);
+  selectedArr.push(...masterSelectedArr);
+  selectedArr.push(...childSelectedArr);
+  //主表控制 start
+  if (associatedFormsCurrentFormFieldTree1.value) {
+    associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function (item: any) {
+      if (item.type == "table") {
+        item.children.forEach((element: any) => {
+          element.disabled = false;
+        });
+      } else {
+        item.disabled = false;
+      }
+    });
+  }
+  if (associatedFormsCurrentFormFieldTree1.value) {
+    associatedFormsCurrentFormFieldTree1.value[0].children?.forEach(function (item: any) {
+      if (item.type == "table") {
+        item.children.forEach((element: any) => {
+          selectedArr.forEach((j: any) => {
+            if (j.rightValue == element.id) {
+              element.disabled = true;
             }
-        })
-    }
-    //主表控制 end
-    
-    //子表控制start
-    if(currentFormChildTableFieldsForFillRole.value){
-        currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
-            element.children.forEach((item: any) => {
-                selectedArr.forEach((j:any) => {
-                    item.disabled = false
-                })
-            });
+          });
         });
-    }
-    if(currentFormChildTableFieldsForFillRole.value){
-        currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
-            element.children.forEach((item: any) => {
-                selectedArr.forEach((j:any) => {
-                    if(j.rightValue==item.id){
-                        item.disabled = true
-                    }
-                })
-            });
+      } else {
+        selectedArr.forEach((element: any) => {
+          if (element.rightValue == item.id) {
+            item.disabled = true;
+          }
         });
-    }
-    //子表控制end
+      }
+    });
+  }
+  //主表控制 end
+
+  //子表控制start
+  if (currentFormChildTableFieldsForFillRole.value) {
+    currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
+      element.children.forEach((item: any) => {
+        selectedArr.forEach((j: any) => {
+          item.disabled = false;
+        });
+      });
+    });
+  }
+  if (currentFormChildTableFieldsForFillRole.value) {
+    currentFormChildTableFieldsForFillRole.value[0]?.children?.forEach((element: any) => {
+      element.children.forEach((item: any) => {
+        selectedArr.forEach((j: any) => {
+          if (j.rightValue == item.id) {
+            item.disabled = true;
+          }
+        });
+      });
+    });
+  }
+  //子表控制end
 }
 
 //确定回调
-function handleDetermine(){
-    associatedFormsHideDialogFlag.value = false
-    determine.value = true
-    controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml
+function handleDetermine() {
+  associatedFormsHideDialogFlag.value = false;
+  determine.value = true;
+  controlData.value.control.hideConditionHtmlCopy =
+    controlData.value.control.hideConditionHtml;
 }
-function handleDetermineRange(){
-    associatedFormsDataRangeDialogFlag.value = false
-    determineRange.value = true
-    controlData.value.control.dataRangeConditionHtmlCopy = controlData.value.control.dataRangeConditionHtml
+function handleDetermineRange() {
+  associatedFormsDataRangeDialogFlag.value = false;
+  determineRange.value = true;
+  controlData.value.control.dataRangeConditionHtmlCopy =
+    controlData.value.control.dataRangeConditionHtml;
 }
 //数据填充规则
 
-const associatedFormsFillRolesDialogFlag = ref(false)
+const associatedFormsFillRolesDialogFlag = ref(false);
 //数据填充规则设置按钮
-function associatedFormsDataFillRolesDialoghandle(){
-    if(controlData.value.control.formid===''){
-        alert("请先选择要关联的表单")
-        
-    }else{
-        associatedFormsFillRolesDialogFlag.value = true
-    }
+function associatedFormsDataFillRolesDialoghandle() {
+  if (controlData.value.control.formid === "") {
+    alert("请先选择要关联的表单");
+  } else {
+    associatedFormsFillRolesDialogFlag.value = true;
+  }
 }
 
-function asfhTextCancelFillRoles(){
-    associatedFormsFillRolesDialogFlag.value = false
+function asfhTextCancelFillRoles() {
+  associatedFormsFillRolesDialogFlag.value = false;
 }
 //数据填充规则确定按钮
-function handleDetermineFillRoles(){
-    
-    associatedFormsFillRolesDialogFlag.value = false
+function handleDetermineFillRoles() {
+  associatedFormsFillRolesDialogFlag.value = false;
 }
 
-
-watch(()=>store.activeKey, () => {
-	// console.log("activeKey",store.activeKey);
-    if(controlData.value.type==='associatedForms'){
-        setTimeout(() => {
-            formidChanged()
-        }, 800);
-        /* aft.value.tinymceReInit()
+watch(
+  () => store.activeKey,
+  () => {
+    // console.log("activeKey",store.activeKey);
+    if (controlData.value.type === "associatedForms") {
+      setTimeout(() => {
+        formidChanged();
+      }, 800);
+      /* aft.value.tinymceReInit()
         aftRange.value.tinymceReInit() */
-    }else if(controlData.value.type==='radio'||controlData.value.type==='select'||controlData.value.type==='checkbox'){
-        
-        setTimeout(() => {
-            formidChangedOptionsValue3()
-        }, 800);
+    } else if (
+      controlData.value.type === "radio" ||
+      controlData.value.type === "select" ||
+      controlData.value.type === "checkbox"
+    ) {
+      setTimeout(() => {
+        formidChangedOptionsValue3();
+      }, 800);
     }
-})
-
-
-function addFillRole(){
-    let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-    controlData.value.control.fillRoles.master.push({
-        leftValue:'',
-		rightValue:'',
-        id:onlyNumber,
-    })
+  }
+);
+
+function addFillRole() {
+  let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+  controlData.value.control.fillRoles.master.push({
+    leftValue: "",
+    rightValue: "",
+    id: onlyNumber,
+  });
 }
 
-function addChildFillRole(){
-    //子表填充规则要受到子表数量的限制
-    //currentChildTableCount
-    //controlData.value.control.fillRoles.child.length
-    selectedOrDelChildRole()
-    childRoleRightChanged()
-if(controlData.value.control.fillRoles.child.length<currentChildTableCount){
-        let onlyNumber = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        let onlyNumber1 = uuidv4().replaceAll('-','').toString();   //获取唯一编码
-        controlData.value.control.fillRoles.child.push({
-                                                        id: onlyNumber,
-                                                        asfChildTableKey: '',
-                                                        filterCondition:{
-                                                            conditionHtml: '',
-                                                            conditionHtmlCopy: '',
-                                                            gongShi:{
-                                                                formulaHtml:'',
-                                                                mathsFormula:'',
-                                                                mathsString:'',
-                                                            },
-                                                        },
-                                                        childRoles:[{
-											leftValue: '',
-											rightValue: '',
-											id: onlyNumber1,
-										}]
-                                                    })
-    }else{
-        alert("当前关联表单共 "+controlData.value.control.fillRoles.child.length+" 张子表,不可再添加")
-    }
-    
+function addChildFillRole() {
+  //子表填充规则要受到子表数量的限制
+  //currentChildTableCount
+  //controlData.value.control.fillRoles.child.length
+  selectedOrDelChildRole();
+  childRoleRightChanged();
+  if (controlData.value.control.fillRoles.child.length < currentChildTableCount) {
+    let onlyNumber = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+    let onlyNumber1 = uuidv4().replaceAll("-", "").toString(); //获取唯一编码
+    controlData.value.control.fillRoles.child.push({
+      id: onlyNumber,
+      asfChildTableKey: "",
+      filterCondition: {
+        conditionHtml: "",
+        conditionHtmlCopy: "",
+        gongShi: {
+          formulaHtml: "",
+          mathsFormula: "",
+          mathsString: "",
+        },
+      },
+      childRoles: [
+        {
+          leftValue: "",
+          rightValue: "",
+          id: onlyNumber1,
+        },
+      ],
+    });
+  } else {
+    alert(
+      "当前关联表单共 " +
+        controlData.value.control.fillRoles.child.length +
+        " 张子表,不可再添加"
+    );
+  }
 }
 
-function delRole(id:String){
-    const delRoleData:any = controlData.value.control.fillRoles.master
-        for (var i = 0; i < delRoleData.length; i++) {
-            if(delRoleData[i].id===id){
-                delRoleData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
+function delRole(id: String) {
+  const delRoleData: any = controlData.value.control.fillRoles.master;
+  for (var i = 0; i < delRoleData.length; i++) {
+    if (delRoleData[i].id === id) {
+      delRoleData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
 }
 
-
-
-function delChildRole(id:String){
-    
-    const delRoleData:any = controlData.value.control.fillRoles.child
-        for (var i = 0; i < delRoleData.length; i++) {
-            if(delRoleData[i].id===id){
-                delRoleData.splice(i, 1);
-                i--; // 如果不减，将漏掉一个元素
-            }
-        }
-        selectedOrDelChildRole()
-        childRoleRightChanged()
+function delChildRole(id: String) {
+  const delRoleData: any = controlData.value.control.fillRoles.child;
+  for (var i = 0; i < delRoleData.length; i++) {
+    if (delRoleData[i].id === id) {
+      delRoleData.splice(i, 1);
+      i--; // 如果不减，将漏掉一个元素
+    }
+  }
+  selectedOrDelChildRole();
+  childRoleRightChanged();
 }
-const associatedFormsChooseDialogFlag = ref(false)
-function chooseAssociatedForm(){
-    associatedFormsChooseDialogFlag.value = true
+const associatedFormsChooseDialogFlag = ref(false);
+function chooseAssociatedForm() {
+  associatedFormsChooseDialogFlag.value = true;
 }
-function handleDetermineAssociatedFormsChooseDialog(){
-    associatedFormsChooseDialogFlag.value = false
+function handleDetermineAssociatedFormsChooseDialog() {
+  associatedFormsChooseDialogFlag.value = false;
 }
 
-
-
-//liwenxuan20240403 associatedForms end 
-
+//liwenxuan20240403 associatedForms end
 
 //liwenxuan20240426 单选多选下拉 关联选项设置  start
 
-const glxxszDialogFlag = ref(false)
-const glxxszDialogFlagCheckBox = ref(false)
-const glxxszDialogFlagSwitch = ref(false)
-function handelGlxxszDialogSwitch(){
-    if(controlData.value.control.activeValue==undefined||controlData.value.control.inactiveValue==undefined){
-        alert("请先设置开关状态打开/关闭时的值")
-    }else{
-        glxxszDialogFlagSwitch.value = true
-    }
+const glxxszDialogFlag = ref(false);
+const glxxszDialogFlagCheckBox = ref(false);
+const glxxszDialogFlagSwitch = ref(false);
+function handelGlxxszDialogSwitch() {
+  if (
+    controlData.value.control.activeValue == undefined ||
+    controlData.value.control.inactiveValue == undefined
+  ) {
+    alert("请先设置开关状态打开/关闭时的值");
+  } else {
+    glxxszDialogFlagSwitch.value = true;
+  }
 }
-function handelGlxxszDialog(){
-    if(controlData.value.options.length===0){
-        alert("无可配置选项，请先添加。")
-    }else{
-        glxxszDialogFlag.value = true
-    }
+function handelGlxxszDialog() {
+  if (controlData.value.options.length === 0) {
+    alert("无可配置选项，请先添加。");
+  } else {
+    glxxszDialogFlag.value = true;
+  }
 }
 
-function handelGlxxszDialogCheckbox(){
-    glxxszDialogFlagCheckBox.value = true
+function handelGlxxszDialogCheckbox() {
+  glxxszDialogFlagCheckBox.value = true;
 }
 
-function handleDetermineGlxxszDialog(){
-    glxxszDialogFlag.value = false
+function handleDetermineGlxxszDialog() {
+  glxxszDialogFlag.value = false;
 }
-function handleDetermineGlxxszDialogSwitch(){
-    glxxszDialogFlagSwitch.value = false
+function handleDetermineGlxxszDialogSwitch() {
+  glxxszDialogFlagSwitch.value = false;
 }
-function handleDetermineGlxxszDialogCheckBox(){
-    glxxszDialogFlagCheckBox.value = false
+function handleDetermineGlxxszDialogCheckBox() {
+  glxxszDialogFlagCheckBox.value = false;
 }
 //同步开关的设置值和开关关联选项设置的值
-watch(()=>controlData.value.control,(newVal) => {
-	// console.log("同步开关的设置值和开关关联选项设置的值",typeof(newVal))
-    if(typeof(newVal)!="undefined"){
-        if(typeof(newVal.glxxszSwitch)!="undefined"){
-            if(typeof(controlData.value.control.activeValue)!="undefined"){
-                controlData.value.control.glxxszSwitch[0].openValue = controlData.value.control.activeValue
-                controlData.value.control.glxxszSwitch[0].conditionField = controlData.value.name
-            }
-            if(typeof(controlData.value.control.inactiveValue)!="undefined"){
-                controlData.value.control.glxxszSwitch[1].offValue = controlData.value.control.inactiveValue
-                controlData.value.control.glxxszSwitch[1].conditionField = controlData.value.name
-            }
+watch(
+  () => controlData.value.control,
+  (newVal) => {
+    // console.log("同步开关的设置值和开关关联选项设置的值",typeof(newVal))
+    if (typeof newVal != "undefined") {
+      if (typeof newVal.glxxszSwitch != "undefined") {
+        if (typeof controlData.value.control.activeValue != "undefined") {
+          controlData.value.control.glxxszSwitch[0].openValue =
+            controlData.value.control.activeValue;
+          controlData.value.control.glxxszSwitch[0].conditionField =
+            controlData.value.name;
         }
+        if (typeof controlData.value.control.inactiveValue != "undefined") {
+          controlData.value.control.glxxszSwitch[1].offValue =
+            controlData.value.control.inactiveValue;
+          controlData.value.control.glxxszSwitch[1].conditionField =
+            controlData.value.name;
+        }
+      }
     }
-	// console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
-},{ deep: true })
-
-
-
+    // console.log("同步开关的设置值和开关关联选项设置的值",controlData.value.control)
+  },
+  { deep: true }
+);
 
 //radio,select添加选项时同步配置选项
-watch(()=>controlData.value.options, (changedOptions:any) => {
-	// console.log("radio,select添加选项时同步配置选项",changedOptions)
-	// console.log("radio,select添加选项时同步配置选项------>",controlData.value)
-    if(controlData.value.type === "radio" || controlData.value.type === "select"){
-        if(controlData.value.config.optionsType==0){
-            if(changedOptions.length===0){
-                //删没了option
-                controlData.value.control.glxxsz = []
-            }else{
-                if(changedOptions.length < controlData.value.control.glxxsz.length){
-                    //删除了某个option
-                    controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter((item: { optionValue: any }) => changedOptions.find((bItem: { value: any }) => item.optionValue == bItem.value))
-                }else{
-                    for(var i = 0; i < changedOptions.length; i++){
-                        if(controlData.value.control.glxxsz[i]===undefined){
-                            //新增了某个option
-                            controlData.value.control.glxxsz.push(
-                                {
-                                    conditionField: controlData.value.name,
-                                    optionLabel: changedOptions[i].label,
-                                    optionValue: changedOptions[i].value,
-                                    tableIndex: i,
-                                    id: uuidv4().replaceAll('-','').toString(),
-                                }
-                            )
-                        }else{
-                            //修改了某个option
-                            controlData.value.control.glxxsz[i].optionLabel = changedOptions[i].label
-                            controlData.value.control.glxxsz[i].optionValue = changedOptions[i].value
-                        }
-                    }
-                }
+watch(
+  () => controlData.value.options,
+  (changedOptions: any) => {
+    // console.log("radio,select添加选项时同步配置选项",changedOptions)
+    // console.log("radio,select添加选项时同步配置选项------>",controlData.value)
+    if (controlData.value.type === "radio" || controlData.value.type === "select") {
+      if (controlData.value.config.optionsType == 0) {
+        if (changedOptions.length === 0) {
+          //删没了option
+          controlData.value.control.glxxsz = [];
+        } else {
+          if (changedOptions.length < controlData.value.control.glxxsz.length) {
+            //删除了某个option
+            controlData.value.control.glxxsz = controlData.value.control.glxxsz.filter(
+              (item: { optionValue: any }) =>
+                changedOptions.find(
+                  (bItem: { value: any }) => item.optionValue == bItem.value
+                )
+            );
+          } else {
+            for (var i = 0; i < changedOptions.length; i++) {
+              if (controlData.value.control.glxxsz[i] === undefined) {
+                //新增了某个option
+                controlData.value.control.glxxsz.push({
+                  conditionField: controlData.value.name,
+                  optionLabel: changedOptions[i].label,
+                  optionValue: changedOptions[i].value,
+                  tableIndex: i,
+                  id: uuidv4().replaceAll("-", "").toString(),
+                });
+              } else {
+                //修改了某个option
+                controlData.value.control.glxxsz[i].optionLabel = changedOptions[i].label;
+                controlData.value.control.glxxsz[i].optionValue = changedOptions[i].value;
+              }
             }
+          }
         }
-    }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,
-                selectedOptions:[],
-                showFields:[],
-                id: uuidv4().replaceAll('-','').toString(),
-            }
-        )
+      }
+    } 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,
+      selectedOptions: [],
+      showFields: [],
+      id: uuidv4().replaceAll("-", "").toString(),
+    });
+  }
 }
 
-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)
-    }
+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)
-function optionsValue3Setting(){
-    optionsValue3SettingDialogOpenFlag.value = true
+const optionsValue3SettingDialogOpenFlag = ref(false);
+function optionsValue3Setting() {
+  optionsValue3SettingDialogOpenFlag.value = true;
 }
-function handleDetermineoptionsValue3(){
-    optionsValue3SettingDialogOpenFlag.value = false
+function handleDetermineoptionsValue3() {
+  optionsValue3SettingDialogOpenFlag.value = false;
 }
 
-
-
 //liwenxuan20240426 单选多选下拉 关联选项设置  end
 
-
-function optionsTypeChanged(){
-    controlData.value.config.optionsFun = ''
-    controlData.value.options = []
+function optionsTypeChanged() {
+  controlData.value.config.optionsFun = "";
+  controlData.value.options = [];
 }
 
-
-
-
-		
-    const optionsCss = [
-              { label: '无样式', value: '' },
-              { label: '每行两列', value: 'form-row-2' },
-              { label: '每行三列', value: 'form-row-3' },
-              { label: '每行四列', value: 'form-row-4' }
-    ]
-    const layouytStyle = reactive<any>(controlData.value.styles)
-    watch(()=>layouytStyle,(val : any)=>{
+const optionsCss = [
+  { label: "无样式", value: "" },
+  { label: "每行两列", value: "form-row-2" },
+  { label: "每行三列", value: "form-row-3" },
+  { label: "每行四列", value: "form-row-4" },
+];
+const layouytStyle = reactive<any>(controlData.value.styles);
+watch(
+  () => layouytStyle,
+  (val: any) => {
     //   console.log("监听样式处理",val)
-      controlData.value.styles = val
-     // Object.assign(store.controlAttr.styles.divStyle, val)
-    },
-    {
-      deep: true
-    });
-    const setStylefield = ref<string>("divStyle")
-    //liwenxuan 20240111 carousel  end  
-    const activeFormName = ref("0")
-    
-    /**
+    controlData.value.styles = val;
+    // Object.assign(store.controlAttr.styles.divStyle, val)
+  },
+  {
+    deep: true,
+  }
+);
+const setStylefield = ref<string>("divStyle");
+//liwenxuan 20240111 carousel  end
+const activeFormName = ref("0");
+
+/**
     @ 作者: 秦东
     @ 时间: 2024-03-01 08:16:45
     @ 功能: 判断是否是组件
     */
-    const cssIsShouw = (val:any) => {
-        if(val.length && val.length > 0){
-            return true;
-        }
-        return false;
-    }
+const cssIsShouw = (val: any) => {
+  if (val.length && val.length > 0) {
+    return true;
+  }
+  return false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-18 11:42:52
 @ 功能: 上传图标相关
 */
-const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown" //上传地址
-const handleAvatarSuccess: UploadProps['onSuccess'] = (
-  response,
-  uploadFile
-) => {
-	//   imageUrl.value = URL.createObjectURL(uploadFile.raw!)
-	formConfig.value.imageUrl = response.data.url
-}
-
-const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
-	// console.log("beforeAvatarUpload",rawFile.type)
-  if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/jpg' && rawFile.type !== 'image/png' && rawFile.type !== 'image/gif' && rawFile.type !== 'image/icon') {
-    ElMessage.error('请上传以下格式的图片(jpg、jpeg、png、gif、icon)!'+rawFile.type)
-    return false
+const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API + "/api/upordown"; //上传地址
+const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
+  //   imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+  formConfig.value.imageUrl = response.data.url;
+};
+
+const beforeAvatarUpload: UploadProps["beforeUpload"] = (rawFile) => {
+  // console.log("beforeAvatarUpload",rawFile.type)
+  if (
+    rawFile.type !== "image/jpeg" &&
+    rawFile.type !== "image/jpg" &&
+    rawFile.type !== "image/png" &&
+    rawFile.type !== "image/gif" &&
+    rawFile.type !== "image/icon"
+  ) {
+    ElMessage.error("请上传以下格式的图片(jpg、jpeg、png、gif、icon)!" + rawFile.type);
+    return false;
   } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('图片大小不要大于 2MB!')
-    return false
+    ElMessage.error("图片大小不要大于 2MB!");
+    return false;
   }
-  return true
-}
-
-const page = ref<number>(1)
-const pageSize = ref<number>(200000)
-const loadingmore = ref(false)
-const loadingnomore = ref(false)
-const formGroup = ref<any[]>([])
+  return true;
+};
+
+const page = ref<number>(1);
+const pageSize = ref<number>(200000);
+const loadingmore = ref(false);
+const loadingnomore = ref(false);
+const formGroup = ref<any[]>([]);
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-19 08:38:27
 @ 功能: 获取表单分组
 */
-const gainFormGroupList = () =>{
-	loadingmore.value = true;
-	let sendInfo = {
-		page:page.value,
-		pagesize:pageSize.value,
-		state:1
-	}
-	customerFormGroupList(sendInfo)
-		.then((data)=>{
-			// console.log("获取表单分组",data)
-			formGroup.value = data.data
-		})
-		.finally(()=>{
-			loadingmore.value = false;
-		})
-}
-let asfs: any[] = []
-let asfsExpectCurrent: any[] = []
-
-
+const gainFormGroupList = () => {
+  loadingmore.value = true;
+  let sendInfo = {
+    page: page.value,
+    pagesize: pageSize.value,
+    state: 1,
+  };
+  customerFormGroupList(sendInfo)
+    .then((data) => {
+      // console.log("获取表单分组",data)
+      formGroup.value = data.data;
+    })
+    .finally(() => {
+      loadingmore.value = false;
+    });
+};
+let asfs: any[] = [];
+let asfsExpectCurrent: any[] = [];
 
-watch(()=>props.formList,(dataList:any)=>{
+watch(
+  () => props.formList,
+  (dataList: any) => {
     //console.log(dataList)
-    
-    if(dataList&&Array.isArray(dataList)&&dataList.length>0&&controlData.value.type=="associatedForms"&&currentAsfChangeCount.value==0){
-        //console.log(1)
-        asfsExpectCurrent = []
-        asfs = []
-        currentAsfChangeCount.value = 1
-        for(let i = 0;i<dataList.length;i++){
-            if(dataList[i].type=="associatedForms"){
-                asfs.push(dataList[i])
-            }else if(dataList[i].type=="card"||dataList[i].type=="flex"||dataList[i].type=="div"||dataList[i].type=="table"){
-                
-                dataList[i].list.forEach((element:any) => {
-                    if(element.type=="associatedForms"){
-                        asfs.push(element)
-                    }
-                });
-            }else if(dataList[i].type=="grid"){
-                let columns = JSON.parse(JSON.stringify(dataList[i].columns));
-                //console.log(columns)
-                if(columns.length>0){ 
-                    for(let z = 0;z<columns.length;z++){
-                        for(let x = 0; x<columns[z].list.length;x++){
-                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-                            //console.log(a)
-                            if(a.type=="associatedForms"){
-                                asfs.push(a)
-                            }
-                            
-                        }
-                    }
+
+    if (
+      dataList &&
+      Array.isArray(dataList) &&
+      dataList.length > 0 &&
+      controlData.value.type == "associatedForms" &&
+      currentAsfChangeCount.value == 0
+    ) {
+      //console.log(1)
+      asfsExpectCurrent = [];
+      asfs = [];
+      currentAsfChangeCount.value = 1;
+      for (let i = 0; i < dataList.length; i++) {
+        if (dataList[i].type == "associatedForms") {
+          asfs.push(dataList[i]);
+        } else if (
+          dataList[i].type == "card" ||
+          dataList[i].type == "flex" ||
+          dataList[i].type == "div" ||
+          dataList[i].type == "table"
+        ) {
+          dataList[i].list.forEach((element: any) => {
+            if (element.type == "associatedForms") {
+              asfs.push(element);
+            }
+          });
+        } else if (dataList[i].type == "grid") {
+          let columns = JSON.parse(JSON.stringify(dataList[i].columns));
+          //console.log(columns)
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
                 }
-            }else if(dataList[i].type=="tabs"){//tabs标签页有可能再嵌套一层flex或者table
-                let columns = JSON.parse(JSON.stringify(dataList[i].columns));
-                if(columns.length>0){
-                    for(let z = 0;z<columns.length;z++){
-                        for(let x = 0; x<columns[z].list.length;x++){
-                            let a = JSON.parse(JSON.stringify(columns[z].list[x]));
-                            //console.log(a)
-                            if(a.type=="associatedForms"){
-                                asfs.push(a)
-                            }else if(a.type=="flex"||a.type=="table"){
-                                if(a.list.length>0){
-                                    for(let m = 0;m<a.list.length;m++){
-                                        let q = JSON.parse(JSON.stringify(a.list[m]))
-                                        //console.log(q)
-                                        if(q.type=="associatedForms"){
-                                            asfs.push(q)
-                                        }
-                                    }
-                                }
-                            }
-                        }
+              }
+            }
+          }
+        } else if (dataList[i].type == "tabs") {
+          //tabs标签页有可能再嵌套一层flex或者table
+          let columns = JSON.parse(JSON.stringify(dataList[i].columns));
+          if (columns.length > 0) {
+            for (let z = 0; z < columns.length; z++) {
+              for (let x = 0; x < columns[z].list.length; x++) {
+                let a = JSON.parse(JSON.stringify(columns[z].list[x]));
+                //console.log(a)
+                if (a.type == "associatedForms") {
+                  asfs.push(a);
+                } else if (a.type == "flex" || a.type == "table") {
+                  if (a.list.length > 0) {
+                    for (let m = 0; m < a.list.length; m++) {
+                      let q = JSON.parse(JSON.stringify(a.list[m]));
+                      //console.log(q)
+                      if (q.type == "associatedForms") {
+                        asfs.push(q);
+                      }
                     }
+                  }
                 }
-            }	
+              }
+            }
+          }
         }
-        if(asfs.length>0){
-            asfsExpectCurrent = asfs.filter((item:any)=>{
-                return item.name!=controlData.value.name
-            })
-            /* if(asfsExpectCurrent.length>0){
+      }
+      if (asfs.length > 0) {
+        asfsExpectCurrent = asfs.filter((item: any) => {
+          return item.name != controlData.value.name;
+        });
+        /* if(asfsExpectCurrent.length>0){
                 console.log(asfsExpectCurrent)
             } */
-        }
+      }
     }
-    
-    
-},{
-    deep:true
-})
-
+  },
+  {
+    deep: true,
+  }
+);
 
 onMounted(() => {
-    
-    //console.log("------------------->",props.formData,props.formList) 
-    
-    
+  //console.log("------------------->",props.formData,props.formList)
 
-    
-    
-	gainFormGroupList()
-    
-    
-    
-    
-})
+  gainFormGroupList();
+});
 
 /**
 @ 作者: 秦东
@@ -3249,61 +3325,62 @@ onMounted(() => {
 const handleVisibleChange = (visible: any) => {
   if (visible) {
     // 如果下拉框显示
-    let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap')
+    let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
     // 监听下拉框滚动事件
-    selectDropdown.addEventListener('scroll', loadNextPage)
+    selectDropdown.addEventListener("scroll", loadNextPage);
   } else {
     // 如果下拉框隐藏
-    let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap')
+    let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
     // 移除下拉框滚动事件监听
-    selectDropdown.removeEventListener('scroll', loadNextPage)
+    selectDropdown.removeEventListener("scroll", loadNextPage);
   }
-}
+};
 const loadNextPage = () => {
-  let selectDropdown: any = document.querySelector('.el-select-dropdown__wrap');
+  let selectDropdown: any = document.querySelector(".el-select-dropdown__wrap");
   // 判断下拉框是否触底
-  if (selectDropdown.scrollTop + selectDropdown.clientHeight >= selectDropdown.scrollHeight - 2) {
-    loadingnomore.value = false
-    loadingmore.value = true
+  if (
+    selectDropdown.scrollTop + selectDropdown.clientHeight >=
+    selectDropdown.scrollHeight - 2
+  ) {
+    loadingnomore.value = false;
+    loadingmore.value = true;
     if (selectoptions.value.length <= 20) {
       setTimeout(() => {
         selectoptions.value.push({
           label: String(selectoptions.value.length),
           value: String(selectoptions.value.length),
-        }
-        )
-        loadingmore.value = false
-
-      }, 2000)
-    }else{
-      loadingmore.value = false
-    selectDropdown.removeEventListener('scroll', loadNextPage)
-    loadingnomore.value = true
+        });
+        loadingmore.value = false;
+      }, 2000);
+    } else {
+      loadingmore.value = false;
+      selectDropdown.removeEventListener("scroll", loadNextPage);
+      loadingnomore.value = true;
     }
   } else {
-    loadingnomore.value = true
+    loadingnomore.value = true;
   }
-}
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-06-22 13:57:55
 @ 功能: 判断该输入框是否不可编辑
 */
-const disabledIstrue = (val:string) => {
-	let ary = ["creater","creater_time","edit_time","owner","org"]
-	if (ary.includes(val)){
-		return true;
-	}else{
-		return false;
-	}
-}
+const disabledIstrue = (val: string) => {
+  let ary = ["creater", "creater_time", "edit_time", "owner", "org"];
+  if (ary.includes(val)) {
+    return true;
+  } else {
+    return false;
+  }
+};
 
 // watch(()=>controlData.value.customRules,(val:any) => {
 // 	// console.log("啊啊啊啊啊",val,typeof(val));
 // 	if(typeof(val)=="object"){
 // 		if(Array.isArray(val)){
 // 			val.forEach((item:any)=>{
-				
+
 // 			})
 // 		}
 // 	}
@@ -3315,305 +3392,352 @@ const disabledIstrue = (val:string) => {
 @ 时间: 2024-08-14 13:16:26
 @ 功能: 必填文本框改变
 */
-const requiredText = (val:any) => {
-	
-	if(typeof(controlData.value.customRules)=="object"){
-		if(Array.isArray(controlData.value.customRules)){	
-			controlData.value.customRules.forEach((item:any)=>{
-				if(item.type == ValidateText.type){
-					item.message = val
-				}
-			})
-		}
-	}
-	console.log("判断校验规则-1-->",controlData.value.customRules)
-}
+const requiredText = (val: any) => {
+  if (typeof controlData.value.customRules == "object") {
+    if (Array.isArray(controlData.value.customRules)) {
+      controlData.value.customRules.forEach((item: any) => {
+        if (item.type == ValidateText.type) {
+          item.message = val;
+        }
+      });
+    }
+  }
+  console.log("判断校验规则-1-->", controlData.value.customRules);
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 14:35:07
 @ 功能: 校验文本框改变
 */
-const requiredTextRadio = (val:any) => {
-	console.log("校验文本框改变-->",val)
-	if(val.type == radioVerify.type){
-		if(typeof(controlData.value.customRules)=="object"){
-			if(Array.isArray(controlData.value.customRules)){	
-				controlData.value.customRules.forEach((item:any)=>{
-					if(item.type == radioVerify.type){
-						item.message = val.message
-					}
-				})
-			}
-		}
-	}
-	
-}
+const requiredTextRadio = (val: any) => {
+  console.log("校验文本框改变-->", val);
+  if (val.type == radioVerify.type) {
+    if (typeof controlData.value.customRules == "object") {
+      if (Array.isArray(controlData.value.customRules)) {
+        controlData.value.customRules.forEach((item: any) => {
+          if (item.type == radioVerify.type) {
+            item.message = val.message;
+          }
+        });
+      }
+    }
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 13:21:43
 @ 功能: 是否选中必填
 */
-const requiredChangeSet = (val:boolean) => {
-	if (!controlData.value?.customRules) {
-		controlData.value.customRules = []
+const requiredChangeSet = (val: boolean) => {
+  if (!controlData.value?.customRules) {
+    controlData.value.customRules = [];
+  }
+  if (val) {
+    if (
+      Array.isArray(controlData.value.customRules) &&
+      controlData.value.customRules.length > 0
+    ) {
+      let isNewWrite = true;
+      controlData.value.customRules.forEach((item: any) => {
+        if (item.type == ValidateText.type) {
+          isNewWrite = false;
+        }
+      });
+      if (isNewWrite) {
+        controlData.value.customRules.push({
+          type: ValidateText.type,
+          message: ValidateText.message,
+          trigger: "blur",
+        });
+      }
+    } else {
+      controlData.value.customRules.push({
+        type: ValidateText.type,
+        message: ValidateText.message,
+        trigger: "blur",
+      });
     }
-	if(val){
-		if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-			let isNewWrite = true
-			controlData.value.customRules.forEach((item:any)=>{
-				if(item.type == ValidateText.type){
-					isNewWrite = false
-				}
-			})
-			if(isNewWrite){
-				controlData.value.customRules.push({ 
-					type: ValidateText.type, 
-					message: ValidateText.message, 
-					trigger: "blur" 
-				})
-			}
-		}else{
-			controlData.value.customRules.push({ 
-					type: ValidateText.type, 
-					message: ValidateText.message, 
-					trigger: "blur" 
-				})
-		}
-	}else{
-		if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-			controlData.value.customRules.forEach((item:any,index:number)=>{
-				
-				if(item.type == ValidateText.type){
-					controlData.value.customRules.splice(index, 1)
-				}
-			})
-		}
-		// controlData.value.item.rules.splice(0, 1)
-	}
-	// console.log("判断校验规则-222-->",controlData.value.customRules)
-}
+  } else {
+    if (
+      Array.isArray(controlData.value.customRules) &&
+      controlData.value.customRules.length > 0
+    ) {
+      controlData.value.customRules.forEach((item: any, index: number) => {
+        if (item.type == ValidateText.type) {
+          controlData.value.customRules.splice(index, 1);
+        }
+      });
+    }
+    // controlData.value.item.rules.splice(0, 1)
+  }
+  // console.log("判断校验规则-222-->",controlData.value.customRules)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-14 14:14:42
 @ 功能: 单选改变事件
 */
-const radioChangeSet = (val:any) => {
-	console.log("单选改变事件-222-->",val)
-	let pickRadio = {}
-	let isTrue = true
-	textUinrVerfy.forEach((item:any) => {
-		if(item.type == val){
-			pickRadio = item
-			isTrue = false
-		}
-	})
-	if(isTrue){
-		numberUinrVerfy.forEach((item:any) => {
-			if(item.type == val){
-				pickRadio = item
-				isTrue = false
-			}
-		})
-	}
-	// console.log("单选改变事件-3333-->",pickRadio)
-	if (!controlData.value?.customRules) {
-		controlData.value.customRules = []
+const radioChangeSet = (val: any) => {
+  console.log("单选改变事件-222-->", val);
+  let pickRadio = {};
+  let isTrue = true;
+  textUinrVerfy.forEach((item: any) => {
+    if (item.type == val) {
+      pickRadio = item;
+      isTrue = false;
     }
-	if(Array.isArray(controlData.value.customRules) && controlData.value.customRules.length > 0){
-		let isNewWrite = true
-		controlData.value.customRules.forEach((item:any,index:number)=>{
-			if(item.type == ValidateText.type){
-				isNewWrite = false
-			}else{
-				controlData.value.customRules.splice(index, 1)
-			}
-		})
-		controlData.value.customRules.push({ 
-			type: pickRadio.type, 
-			message: pickRadio.message, 
-			trigger: "blur" 
-		})
-	}else{
-		controlData.value.customRules.push({ 
-			type: pickRadio.type, 
-			message: pickRadio.message, 
-			trigger: "blur" 
-		})
-	}
-}
+  });
+  if (isTrue) {
+    numberUinrVerfy.forEach((item: any) => {
+      if (item.type == val) {
+        pickRadio = item;
+        isTrue = false;
+      }
+    });
+  }
+  // console.log("单选改变事件-3333-->",pickRadio)
+  if (!controlData.value?.customRules) {
+    controlData.value.customRules = [];
+  }
+  if (
+    Array.isArray(controlData.value.customRules) &&
+    controlData.value.customRules.length > 0
+  ) {
+    let isNewWrite = true;
+    controlData.value.customRules.forEach((item: any, index: number) => {
+      if (item.type == ValidateText.type) {
+        isNewWrite = false;
+      } else {
+        controlData.value.customRules.splice(index, 1);
+      }
+    });
+    controlData.value.customRules.push({
+      type: pickRadio.type,
+      message: pickRadio.message,
+      trigger: "blur",
+    });
+  } else {
+    controlData.value.customRules.push({
+      type: pickRadio.type,
+      message: pickRadio.message,
+      trigger: "blur",
+    });
+  }
+};
 </script>
 <template>
-    
-	<div  class="sidebar-tools">
-            <el-tabs v-model="state.tabsName">
-                <el-tab-pane label="字段配置" name="first">
-                    <el-form size="small" class="form">
-                        <!-- <div class=""><h3>通用属性</h3></div> -->
-                        <el-divider content-position="left">通用属性</el-divider>
-			
-                        <template v-for="(item, index) in attrList" :key="index">
-							
-    
-                            <el-form-item :label="item.label"  class="form_cont">
-                                <el-select
-                                    v-if="item.type === 'select'"
-                                    :placeholder="item.placeholder"
-                                    v-model="item.value"
-                                    :filterable="item.path === 'name'"
-                                    :allow-create="item.path === 'name'"
-                                    :clearable="item.clearable"
-                                    @change="controlChange(item, $event)"
-                                >
-                                    <el-option
-                                    v-for="(opt, key) in item.dict"
-                                    :key="key"
-                                    :value="item.path === 'name' ? opt.name : key"
-                                    :label="
-                                        item.path === 'name' ? `${opt.label}(${opt.name})` : opt
-                                    "
-                                    />
-                                </el-select>
-                                <el-switch
-                                    v-else-if="item.type === 'switch'"
-                                    v-model="item.value"
-                                    @change="controlChange(item, $event)"
-                                />
-    
-                                <template v-else-if="item.type === 'digitpage'">
-                                    <el-row>
-                                        <el-col :span="12">
-                                            <el-select
-                                                v-model="item.selectvalue"
-                                                :placeholder="item.placeholder"
-                                                :filterable="item.path === 'name'"
-                                                :allow-create="item.path === 'name'"
-                                                :clearable="item.clearable"
-                                                @change="digitPageSub(item, $event)"
-                                            >
-                                                <el-option
-                                                    v-for="(opt, key) in item.dict"
-                                                    :key="key"
-                                                    :value="item.path === 'name' ? opt.name : key"
-                                                    :label="
-                                                        item.path === 'name' ? `${opt.label}(${opt.name})` : opt
-                                                    "
-                                                />
-                                            </el-select>
-                                        </el-col>
-                                        <el-col :span="12">
-                                            <el-input-number
-                                                v-if="item.selectvalue == 'default'"
-                                                v-model="item.control.modelValue"
-                                                class="mx-4"
-                                            />
-                                        </el-col>
-                                    </el-row>
-                                    <div  v-if="item.selectvalue == 'simple'" style="width:100%;cursor: pointer; margin-top:10px;"  @click="openMathDialog(item)" v-html="item.control.mathFormula.formulaHtml"></div>
-                                    <MathFormula  v-model:show="mathBoxShow" :sub-unit="subUnit" :unit-info="attrList" :form-listmap="formListmap" @updata-digit="updataDigit" />
-                                    
-                                </template>
-    
-                                
-                                <el-row v-else-if="item.type === 'uploadvideo_url'">
-                                    <!-- {{ controlData.control }} -->
-                                    <el-upload  
-                                    
-                                    :action="uploadUrl"  :before-remove="beforeRemove"
-                                    :on-success="videoUploadOk" :show-file-list="true"
-                                    :on-error="videoUploadErr"
-                                    :limit="1"
-                                    :on-exceed="handleExceed"
-                                    accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
-                                        <el-button v-if="!controlData.control.videoMsg[videoIndex].videoReady" type="primary">点此上传</el-button>
-                                        <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button>
-                                    </el-upload>
-                                    <!-- <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button> 
+  <div class="sidebar-tools">
+    <el-tabs v-model="state.tabsName">
+      <el-tab-pane label="字段配置" name="first">
+        <el-form size="small" class="form">
+          <!-- <div class=""><h3>通用属性</h3></div> -->
+          <el-divider content-position="left">通用属性</el-divider>
+
+          <template v-for="(item, index) in attrList" :key="index">
+            <el-form-item :label="item.label" class="form_cont">
+              <el-select
+                v-if="item.type === 'select'"
+                :placeholder="item.placeholder"
+                v-model="item.value"
+                :filterable="item.path === 'name'"
+                :allow-create="item.path === 'name'"
+                :clearable="item.clearable"
+                @change="controlChange(item, $event)"
+              >
+                <el-option
+                  v-for="(opt, key) in item.dict"
+                  :key="key"
+                  :value="item.path === 'name' ? opt.name : key"
+                  :label="item.path === 'name' ? `${opt.label}(${opt.name})` : opt"
+                />
+              </el-select>
+              <el-switch
+                v-else-if="item.type === 'switch'"
+                v-model="item.value"
+                @change="controlChange(item, $event)"
+              />
+
+              <template v-else-if="item.type === 'digitpage'">
+                <el-row>
+                  <el-col :span="12">
+                    <el-select
+                      v-model="item.selectvalue"
+                      :placeholder="item.placeholder"
+                      :filterable="item.path === 'name'"
+                      :allow-create="item.path === 'name'"
+                      :clearable="item.clearable"
+                      @change="digitPageSub(item, $event)"
+                    >
+                      <el-option
+                        v-for="(opt, key) in item.dict"
+                        :key="key"
+                        :value="item.path === 'name' ? opt.name : key"
+                        :label="item.path === 'name' ? `${opt.label}(${opt.name})` : opt"
+                      />
+                    </el-select>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-input-number
+                      v-if="item.selectvalue == 'default'"
+                      v-model="item.control.modelValue"
+                      class="mx-4"
+                    />
+                  </el-col>
+                </el-row>
+                <div
+                  v-if="item.selectvalue == 'simple'"
+                  style="width: 100%; cursor: pointer; margin-top: 10px"
+                  @click="openMathDialog(item)"
+                  v-html="item.control.mathFormula.formulaHtml"
+                ></div>
+                <MathFormula
+                  v-model:show="mathBoxShow"
+                  :sub-unit="subUnit"
+                  :unit-info="attrList"
+                  :form-listmap="formListmap"
+                  @updata-digit="updataDigit"
+                />
+              </template>
+
+              <el-row v-else-if="item.type === 'uploadvideo_url'">
+                <!-- {{ controlData.control }} -->
+                <el-upload
+                  :action="uploadUrl"
+                  :before-remove="beforeRemove"
+                  :on-success="videoUploadOk"
+                  :show-file-list="true"
+                  :on-error="videoUploadErr"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                  accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb"
+                >
+                  <el-button
+                    v-if="!controlData.control.videoMsg[videoIndex].videoReady"
+                    type="primary"
+                    >点此上传</el-button
+                  >
+                  <el-button
+                    v-if="controlData.control.videoMsg[videoIndex].videoReady"
+                    type="primary"
+                    >已上传,点击修改</el-button
+                  >
+                </el-upload>
+                <!-- <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady" type="primary">已上传,点击修改</el-button> 
                                     v-if="!controlData.control.videoMsg[videoIndex].videoReady"-->
-                                </el-row>
-                                <!-- <el-row v-else-if="item.type === 'uploadvideo_poster'">
+              </el-row>
+              <!-- <el-row v-else-if="item.type === 'uploadvideo_poster'">
                                     <el-upload  
                                     v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster===''"
                                     :action="uploadUrl"  :before-remove="beforeRemove"
                                     :on-success="videoUploadOk" :show-file-list="true"
                                     :on-error="videoUploadErr"
                                     
-                                    accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
-                                        
-                                        <el-tooltip
-                                            class="box-item"
-                                            content="不上传则视频封面默认为视频第一帧"
-                                            placement="top-end"
-                                        >
-                                            <el-button type="primary">点此上传</el-button>
-                                        </el-tooltip>
-                                    </el-upload>
-                                    <el-button v-if="!controlData.control[videoIndex].videoReady" type="warning">请先上传视频</el-button>
-                                    <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster!=''" type="primary">已上传,点击修改</el-button>
-                                </el-row>  -->
-                                <el-row v-else-if="item.type === 'uploadvideo_autoPlay'">
-                                    <el-switch v-model="controlData.control.videoMsg[videoIndex].videoAutoPlay" />
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_loopPlay'">
-                                    <el-switch v-model="controlData.control.videoMsg[videoIndex].loop" />
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_width'">
-                                    <el-input-number v-model="controlData.control.videoMsg[videoIndex].videoWidth" :step="50" :max="4096"/>
-                                </el-row>
-                                <el-row v-else-if="item.type === 'uploadvideo_height'">
-                                    <el-input-number v-model="controlData.control.videoMsg[videoIndex].videoHeight" :step="50" :max="2160"/>
-                                </el-row>
-    
-                                <el-row v-else-if="item.type === 'carousel'">
-    
-                                    <el-button  type="primary" append-to-body="true" modal="true" @click="dialogTableVisible = true"  >轮播图设置</el-button>
-                                </el-row>
-                                
-
-								<el-row v-else-if="item.type === 'transfer_name'">
-									<el-input
-										v-model="controlData.config.transferName"
-										placeholder="请输入穿梭框名"
-										style="width:221px"
-									/>
-								</el-row>
-								<el-row v-else-if="item.type ==='transfer_options_datasource'">
-									<!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
-									<el-select
-										v-model="controlData.config.transferDataSource"
-										placeholder="选项数据源"
-										style="width: 150px; height:20px">
-										<el-option
-										v-for="dataSourceOption1 in transferDataSourceOptions"
-										:key="dataSourceOption1.value"
-										:label="dataSourceOption1.label"
-										:value="dataSourceOption1.value"
-										/>
-										
-									</el-select>
-									<div v-if="controlData.config.transferDataSource==='固定选项'" style="width: auto;margin-top:33px;margin-left:-220px;padding-bottom: 6px;">
-										<el-button  type="primary" append-to-body="true" modal="true" @click="transferDialogTableVisible = true"  >编辑固定选项</el-button>
-									</div>
-									<div v-if="controlData.config.transferDataSource==='数据源'" style="width: auto;margin-top: 20px;">
-										<!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
-										<el-input
-											v-model="controlData.config.apiUrl"
-											
-											style="width:278px;margin-left: -68px;margin-top: -5px;"
-											placeholder="数据源接口url">
-												<template #prepend>
-													<el-select
-														v-model="controlData.config.method"
-														style="width: 100px">
-														<el-option label="get" value="get" />
-														<el-option label="post" value="post" />
-													</el-select>
-												</template>
-											</el-input>
-									</div>
-								</el-row>
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_radius'">
+                                    accept=".mp4,.MOV,.WMV,.FLV,.AVI,.AVCHD,.WebM,.MKV,.rmvb">
+                                        
+                                        <el-tooltip
+                                            class="box-item"
+                                            content="不上传则视频封面默认为视频第一帧"
+                                            placement="top-end"
+                                        >
+                                            <el-button type="primary">点此上传</el-button>
+                                        </el-tooltip>
+                                    </el-upload>
+                                    <el-button v-if="!controlData.control[videoIndex].videoReady" type="warning">请先上传视频</el-button>
+                                    <el-button v-if="controlData.control.videoMsg[videoIndex].videoReady&&controlData.control.videoMsg[videoIndex].poster!=''" type="primary">已上传,点击修改</el-button>
+                                </el-row>  -->
+              <el-row v-else-if="item.type === 'uploadvideo_autoPlay'">
+                <el-switch
+                  v-model="controlData.control.videoMsg[videoIndex].videoAutoPlay"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_loopPlay'">
+                <el-switch v-model="controlData.control.videoMsg[videoIndex].loop" />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_width'">
+                <el-input-number
+                  v-model="controlData.control.videoMsg[videoIndex].videoWidth"
+                  :step="50"
+                  :max="4096"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'uploadvideo_height'">
+                <el-input-number
+                  v-model="controlData.control.videoMsg[videoIndex].videoHeight"
+                  :step="50"
+                  :max="2160"
+                />
+              </el-row>
+
+              <el-row v-else-if="item.type === 'carousel'">
+                <el-button
+                  type="primary"
+                  append-to-body="true"
+                  modal="true"
+                  @click="dialogTableVisible = true"
+                  >轮播图设置</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.type === 'transfer_name'">
+                <el-input
+                  v-model="controlData.config.transferName"
+                  placeholder="请输入穿梭框名"
+                  style="width: 221px"
+                />
+              </el-row>
+              <el-row v-else-if="item.type === 'transfer_options_datasource'">
+                <!-- <span style="display:inline-block;width:78px">选项数据源</span> -->
+                <el-select
+                  v-model="controlData.config.transferDataSource"
+                  placeholder="选项数据源"
+                  style="width: 150px; height: 20px"
+                >
+                  <el-option
+                    v-for="dataSourceOption1 in transferDataSourceOptions"
+                    :key="dataSourceOption1.value"
+                    :label="dataSourceOption1.label"
+                    :value="dataSourceOption1.value"
+                  />
+                </el-select>
+                <div
+                  v-if="controlData.config.transferDataSource === '固定选项'"
+                  style="
+                    width: auto;
+                    margin-top: 33px;
+                    margin-left: -220px;
+                    padding-bottom: 6px;
+                  "
+                >
+                  <el-button
+                    type="primary"
+                    append-to-body="true"
+                    modal="true"
+                    @click="transferDialogTableVisible = true"
+                    >编辑固定选项</el-button
+                  >
+                </div>
+                <div
+                  v-if="controlData.config.transferDataSource === '数据源'"
+                  style="width: auto; margin-top: 20px"
+                >
+                  <!-- <span style="display:inline-block;width:50px;margin-bottom: 25px;">接口url</span> -->
+                  <el-input
+                    v-model="controlData.config.apiUrl"
+                    style="width: 278px; margin-left: -68px; margin-top: -5px"
+                    placeholder="数据源接口url"
+                  >
+                    <template #prepend>
+                      <el-select v-model="controlData.config.method" style="width: 100px">
+                        <el-option label="get" value="get" />
+                        <el-option label="post" value="post" />
+                      </el-select>
+                    </template>
+                  </el-input>
+                </div>
+              </el-row>
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_radius'">
 									<el-switch v-model="controlData.control.radius" style="margin-right: 15px;"/>
 									<el-popover
 										placement="top-start"
@@ -3626,7 +3750,7 @@ const radioChangeSet = (val:any) => {
 									</template>
 									</el-popover>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_url'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_url'">
 									<el-upload 
 									:action="uploadUrl"  :before-remove="beforeRemove"
 									:on-success="lowcodeImageUploadSuccess" 
@@ -3637,7 +3761,7 @@ const radioChangeSet = (val:any) => {
 										<el-button v-if="controlData.control.uploadFlag" type="primary">已上传,点击修改</el-button>
 									</el-upload>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_showMode'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_showMode'">
 									<el-select
 										v-model="controlData.control.showMode"
 										placeholder="选项数据源"
@@ -3659,7 +3783,7 @@ const radioChangeSet = (val:any) => {
 										<span style="margin-right: 10px;">百分比高 </span><el-input-number v-model="controlData.control.heightPercent" />
 									</div>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_fit'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_fit'">
 									<el-radio-group v-model="controlData.control.fit">
 										<el-popover
 											placement="top-start"
@@ -3724,7 +3848,7 @@ const radioChangeSet = (val:any) => {
 										
 									</el-radio-group>
 								</el-row> -->
-								<!-- <el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
+              <!-- <el-row v-else-if="item.type === 'lowcodeImage_boderAndShadow'">
 									<el-switch v-model="controlData.control.boderAndShadow" style="margin-right: 15px;"/>
 								</el-row>
 								<el-row v-else-if="item.type === 'lowcodeImage_link'">
@@ -3766,404 +3890,461 @@ const radioChangeSet = (val:any) => {
 									
 								</el-row> -->
 
-								<el-row v-else-if="item.type === 'associatedForms_hide'">
-									<el-button v-if="controlData.control.hideConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsHideDialoghandle"  >设置隐藏条件</el-button>
-									<div   style="width:100%; cursor: pointer;"  @click="associatedFormsHideDialoghandle" v-html="controlData.control.hideConditionHtml"></div>
-								</el-row>
-
-
-                                <el-row v-else-if="item.type === 'associatedForms_form'">
-                                    <el-button type="primary" link style="display:block;cursor: pointer;" @click="chooseAssociatedForm">{{ controlData.control.asfasfLabel==''?'选择关联表单':controlData.control.asfasfLabel }}</el-button>
-                                    
-								</el-row> 
-
-                                <el-row v-else-if="item.type === 'associatedForms_dataRange'">
-									<el-button v-if="controlData.control.dataRangeConditionHtml===''" style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataRangeDialoghandle"  >设置数据范围</el-button>
-									<div style="width:100%; cursor: pointer;" @click="associatedFormsDataRangeDialoghandle"  v-html="controlData.control.dataRangeConditionHtml"></div>
-								</el-row>
-
-
-                                <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
-									<el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="associatedFormsDataFillRolesDialoghandle"  >设置数据填充规则</el-button>
-								
-								</el-row>
-
-								<el-row v-else-if="item.path === 'unitName'">
-									<el-input
-										:type="item.inputStyle"
-										v-model="item.value"
-										:placeholder="item.placeholder"
-										disabled 
-									/>
-								
-								</el-row>
-								
-
-                                <el-input
-                                    v-else
-                                    :type="item.inputStyle"
-                                    v-model="item.value"
-                                    :placeholder="item.placeholder"
-									:disabled="isNotWriteWord(item)"
-                                    @input="controlChange(item, $event)"
-                                />
-                                
-    
-                            </el-form-item>
-    
-                            
-                            
-                        </template>
-                        
-                        <template v-if="controlData.config">
-                            <!-- <el-form-item label="联动条件"  class="form_cont">
+              <el-row v-else-if="item.type === 'associatedForms_hide'">
+                <el-button
+                  v-if="controlData.control.hideConditionHtml === ''"
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsHideDialoghandle"
+                  >设置隐藏条件</el-button
+                >
+                <div
+                  style="width: 100%; cursor: pointer"
+                  @click="associatedFormsHideDialoghandle"
+                  v-html="controlData.control.hideConditionHtml"
+                ></div>
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_form'">
+                <el-button
+                  type="primary"
+                  link
+                  style="display: block; cursor: pointer"
+                  @click="chooseAssociatedForm"
+                  >{{
+                    controlData.control.asfasfLabel == ""
+                      ? "选择关联表单"
+                      : controlData.control.asfasfLabel
+                  }}</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_dataRange'">
+                <el-button
+                  v-if="controlData.control.dataRangeConditionHtml === ''"
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsDataRangeDialoghandle"
+                  >设置数据范围</el-button
+                >
+                <div
+                  style="width: 100%; cursor: pointer"
+                  @click="associatedFormsDataRangeDialoghandle"
+                  v-html="controlData.control.dataRangeConditionHtml"
+                ></div>
+              </el-row>
+
+              <el-row v-else-if="item.type === 'associatedForms_FillRoles'">
+                <el-button
+                  style="padding-top: 5px"
+                  type="primary"
+                  link
+                  append-to-body="true"
+                  modal="true"
+                  @click="associatedFormsDataFillRolesDialoghandle"
+                  >设置数据填充规则</el-button
+                >
+              </el-row>
+
+              <el-row v-else-if="item.path === 'unitName'">
+                <el-input
+                  :type="item.inputStyle"
+                  v-model="item.value"
+                  :placeholder="item.placeholder"
+                  disabled
+                />
+              </el-row>
+
+              <el-input
+                v-else
+                :type="item.inputStyle"
+                v-model="item.value"
+                :placeholder="item.placeholder"
+                :disabled="isNotWriteWord(item)"
+                @input="controlChange(item, $event)"
+              />
+            </el-form-item>
+          </template>
+
+          <template v-if="controlData.config">
+            <!-- <el-form-item label="联动条件"  class="form_cont">
                                 <el-switch v-model="controlData.config.linkKey" />
                             </el-form-item> -->
-                            <template v-if="controlData.config.linkKey">
-                                <el-form-item  class="form_cont">
-                                    <el-input
-                                    v-model="controlData.config.linkValue"
-                                    type="textarea"
-                                    placeholder="表达式如: $.input>1 $表示为当前表单数据，input为字段标识"
-                                    />
-                                </el-form-item>
-                                <el-form-item
-                                    class="form_cont"
-                                    v-if="
-                                    showHide(
-                                        [
-                                        'input',
-                                        'textarea',
-                                        'radio',
-                                        'checkbox',
-                                        'select',
-                                        'date',
-                                        'switch',
-                                        'number',
-                                        'cascader',
-                                        'slider',
-                                        'datePicker',
-                                        'timePicker',
-                                        'colorPicker',
-                                        'inputNumber',
-                                        'rate',
-                                        'treeSelect'
-                                        ],
-                                        true
-                                    )
-                                    "
-                                    label="联动结果"
-                                >
-                                    <el-radio-group
-                                        v-model="controlData.config.linkResult"
-                                        class="option-radio"
-                                    >
-                                        <el-radio label="hidden">隐藏(默认)</el-radio>
-                                        <el-radio label="disabled">禁用</el-radio>
-                                    </el-radio-group>
-                                </el-form-item>
-                            </template>
-                        </template>
-                        <template v-if="showHide(['tabs'], true)">
-                            <!-- <div class="h3"><h3>标签配置项</h3></div> -->
-                            <el-divider content-position="left">标签配置项</el-divider>
-                            <el-form-item
-                                class="form_cont"
-                                v-for="(item, index) in controlData.columns"
-                                :key="index"
-                            >
-                                <el-col :span="12">
-                                    <el-input v-model="item.label" placeholder="标签配置项" />
-                                </el-col>
-                                <el-col :span="2" :offset="1">
-                                    <i
-                                        class="icon-del"
-                                        @click="delSelectOption(index as number, 'tabs')"
-                                    ></i>
-                                </el-col>
-                            </el-form-item>
-                            <el-form-item  class="form_cont">
-                                <el-button @click="addSelectOption('tabs')">增加标签</el-button>
-                            </el-form-item>
-                        </template>
-                        <!--编号规则设置--->
-                        <div
-                            v-if="showHide(['serialNumber'],true)"
-                        >
-                            <!-- <div class="h3"><h3>编码规则配置</h3></div> -->
-                            <el-divider content-position="left">编码规则配置</el-divider>
-                            <el-form-item label="编码方式" class="form_cont">
-                                <el-switch v-model="controlData.config.automatic" inline-prompt active-text="自动编码" inactive-text="手动编码" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #E6A23C" />
-                            </el-form-item>
-                            <div v-if="controlData.config.automatic">
-                                <el-form-item v-for="(item, index) in controlData.config.customRules" :key="index" class="form_cont">
-                                    
-                                    <el-input v-model="item.rule" :placeholder="item.message?item.message:'请输入自定义字符'">
-                                        <template #prepend>
-                                            <el-select
-                                                v-model="item.type"
-                                                style="width: 100px"
-                                                @change="rulesSelectNumChange(item, $event)"
-                                            >
-                                                <el-option
-                                                    v-for="list in state.numberRulesList"
-                                                    :key="list.type"
-                                                    :label="list.label"
-                                                    :value="list.type"
-                                                />
-                                            </el-select>
-                                        </template>
-                                        <template #append>
-                                            <i
-                                            class="icon-del"
-                                            @click="delNumRules(index as number)"
-                                            ></i>
-                                        </template>
-                                    </el-input>
-    
-    
-                                </el-form-item>
-                                <el-form-item class="form_cont">
-                                    <el-button @click="addNumRules">添加规则</el-button>
-                                </el-form-item>
-                            </div>
-                        </div>
-                        <!-- {{controlData.config.optionsType}} -->
-                        <div v-if="showHide(['switch'],true)">
-                            <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
-                        </div>
-                        <div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
-                            <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
-                        </div>
-                        <div v-if="showHide(['checkbox',],true)&&controlData.config.optionsType==0">
-                            <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
-                        </div>
-                        <div
-                            v-if="
-                            showHide(
-                                [
-                                'radio',
-                                'select',
-                                'checkbox',
-                                'cascader',
-                                'inputSlot',
-                                'treeSelect'
-                                ],
-                                true
-                            )
-                            "
-                        >
-                            <!-- <div class="h3"><h3>选项配置</h3></div> -->
-                            <el-divider content-position="left">选项配置</el-divider>
-                            <el-form-item v-if="showHide(['select'], true)" label="添加全部项" class="form_cont">
-                                <el-input
-                                    v-model="controlData.config.addAll"
-                                    placeholder="请输入全部项文案"
-                                />
-                            </el-form-item>
-                            <el-form-item label="选项数据源" class="form_cont">
-                                <el-select
-                                    v-model="controlData.config.optionsType"
-                                    @change="optionsTypeChanged"
-                                >
-                                    <el-option :value="0" label="固定选项" />
-                                    <el-option :value="3" label="系统表单字段"/>
-                                    <el-option :value="1" label="数据源" />
-                                    <el-option :value="2" label="接口字典" />
-                                </el-select>
-                            </el-form-item>
-                            <template v-if="controlData.config.optionsType === 0">
-                                <div v-if="controlData.type !== 'cascader'&&controlData.type !== 'checkbox'">
-                                    <el-form-item
-                                        v-for="(item, index) in controlData.options"
-                                        :key="index"
-                                        class="form_cont"
-										label="选项标签"
-                                    >
-                                        <el-col :span="10">
-                                            <el-input v-model="item.label" placeholder="选项标签" />
-                                        </el-col>
-                                        <!-- <el-col :span="10" :offset="1">
+            <template v-if="controlData.config.linkKey">
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="controlData.config.linkValue"
+                  type="textarea"
+                  placeholder="表达式如: $.input>1 $表示为当前表单数据，input为字段标识"
+                />
+              </el-form-item>
+              <el-form-item
+                class="form_cont"
+                v-if="
+                  showHide(
+                    [
+                      'input',
+                      'textarea',
+                      'radio',
+                      'checkbox',
+                      'select',
+                      'date',
+                      'switch',
+                      'number',
+                      'cascader',
+                      'slider',
+                      'datePicker',
+                      'timePicker',
+                      'colorPicker',
+                      'inputNumber',
+                      'rate',
+                      'treeSelect',
+                    ],
+                    true
+                  )
+                "
+                label="联动结果"
+              >
+                <el-radio-group
+                  v-model="controlData.config.linkResult"
+                  class="option-radio"
+                >
+                  <el-radio label="hidden">隐藏(默认)</el-radio>
+                  <el-radio label="disabled">禁用</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </template>
+          </template>
+          <template v-if="showHide(['tabs'], true)">
+            <!-- <div class="h3"><h3>标签配置项</h3></div> -->
+            <el-divider content-position="left">标签配置项</el-divider>
+            <el-form-item
+              class="form_cont"
+              v-for="(item, index) in controlData.columns"
+              :key="index"
+            >
+              <el-col :span="12">
+                <el-input v-model="item.label" placeholder="标签配置项" />
+              </el-col>
+              <el-col :span="2" :offset="1">
+                <i class="icon-del" @click="delSelectOption(index as number, 'tabs')"></i>
+              </el-col>
+            </el-form-item>
+            <el-form-item class="form_cont">
+              <el-button @click="addSelectOption('tabs')">增加标签</el-button>
+            </el-form-item>
+          </template>
+          <!--编号规则设置--->
+          <div v-if="showHide(['serialNumber'], true)">
+            <!-- <div class="h3"><h3>编码规则配置</h3></div> -->
+            <el-divider content-position="left">编码规则配置</el-divider>
+            <el-form-item label="编码方式" class="form_cont">
+              <el-switch
+                v-model="controlData.config.automatic"
+                inline-prompt
+                active-text="自动编码"
+                inactive-text="手动编码"
+                style="--el-switch-on-color: #13ce66; --el-switch-off-color: #e6a23c"
+              />
+            </el-form-item>
+            <div v-if="controlData.config.automatic">
+              <el-form-item
+                v-for="(item, index) in controlData.config.customRules"
+                :key="index"
+                class="form_cont"
+              >
+                <el-input
+                  v-model="item.rule"
+                  :placeholder="item.message ? item.message : '请输入自定义字符'"
+                >
+                  <template #prepend>
+                    <el-select
+                      v-model="item.type"
+                      style="width: 100px"
+                      @change="rulesSelectNumChange(item, $event)"
+                    >
+                      <el-option
+                        v-for="list in state.numberRulesList"
+                        :key="list.type"
+                        :label="list.label"
+                        :value="list.type"
+                      />
+                    </el-select>
+                  </template>
+                  <template #append>
+                    <i class="icon-del" @click="delNumRules(index as number)"></i>
+                  </template>
+                </el-input>
+              </el-form-item>
+              <el-form-item class="form_cont">
+                <el-button @click="addNumRules">添加规则</el-button>
+              </el-form-item>
+            </div>
+          </div>
+          <!-- {{controlData.config.optionsType}} -->
+          <div v-if="showHide(['switch'], true)">
+            <el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
+          </div>
+          <div
+            v-if="
+              showHide(['radio', 'select'], true) && controlData.config.optionsType == 0
+            "
+          >
+            <el-button @click="handelGlxxszDialog">关联选项设置</el-button>
+          </div>
+          <div v-if="showHide(['checkbox'], true) && controlData.config.optionsType == 0">
+            <el-button @click="handelGlxxszDialogCheckbox">关联选项设置</el-button>
+          </div>
+          <div
+            v-if="
+              showHide(
+                ['radio', 'select', 'checkbox', 'cascader', 'inputSlot', 'treeSelect'],
+                true
+              )
+            "
+          >
+            <!-- <div class="h3"><h3>选项配置</h3></div> -->
+            <el-divider content-position="left">选项配置</el-divider>
+            <el-form-item
+              v-if="showHide(['select'], true)"
+              label="添加全部项"
+              class="form_cont"
+            >
+              <el-input
+                v-model="controlData.config.addAll"
+                placeholder="请输入全部项文案"
+              />
+            </el-form-item>
+            <el-form-item label="选项数据源" class="form_cont">
+              <el-select
+                v-model="controlData.config.optionsType"
+                @change="optionsTypeChanged"
+              >
+                <el-option :value="0" label="固定选项" />
+                <el-option :value="3" label="系统表单字段" />
+                <el-option :value="1" label="数据源" />
+                <el-option :value="2" label="接口字典" />
+              </el-select>
+            </el-form-item>
+            <template v-if="controlData.config.optionsType === 0">
+              <div
+                v-if="controlData.type !== 'cascader' && controlData.type !== 'checkbox'"
+              >
+                <el-form-item
+                  v-for="(item, index) in controlData.options"
+                  :key="index"
+                  class="form_cont"
+                  label="选项标签"
+                >
+                  <el-col :span="10">
+                    <el-input v-model="item.label" placeholder="选项标签" />
+                  </el-col>
+                  <!-- <el-col :span="10" :offset="1">
                                             <el-input v-model="item.value" placeholder="选项值" />
                                         </el-col> -->
-                                        <el-col :span="2" :offset="1">
-                                            <i
-                                                class="icon-del"
-                                                @click="delSelectOption(index as number)"
-                                            ></i>
-                                        </el-col>
-                                    </el-form-item>
-                                </div>
-                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
-                                <div v-if="controlData.type !== 'cascader'&&controlData.type == 'checkbox'">
-                                    <draggable
-                                        :list="controlData.options" 
-                                        :force-fallback="true" 
-                                        chosen-class="chosenClass" 
-                                        animation="300"
-                                        
-                                    >
-                                    
-                                        <template #item="{ element }">
-                                            <div class="item form_cont">
-                                                <el-form-item>
-                                                    <el-col :span="2" style="padding-top:4px;cursor: move;color: #66B1FF">
-                                                        <i class="icon-move" ></i>
-                                                    </el-col>
-                                                    <el-col :span="6" style="cursor: move;">
-                                                        选项标签
-                                                    </el-col>
-                                                    <el-col :span="10">
-                                                        <el-input v-model="element.label" placeholder="选项标签" />
-                                                        
-                                                    </el-col>
-                                                    <el-col :span="2" :offset="1">
-                                                        <i
-                                                            class="icon-del"
-                                                            @click="delSelectOption(element.value as number)"
-                                                        ></i>
-                                                    </el-col>
-                                                </el-form-item>
-                                                
-                                            </div>
-                                        </template>
-                                    </draggable>
-                                </div>
-                                <!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
-                                <el-form-item class="form_cont">
-                                    <el-button @click="addSelectOption">{{ controlData.type === 'cascader' ? '编辑' : '新增' }}</el-button>
-                                </el-form-item>
-                            </template>
-                            <template v-else-if="controlData.config.optionsType === 3">
-                                <el-button type="primary" style="margin-bottom:10px;margin-left:80px" plain @click="optionsValue3Setting">选择系统表单字段</el-button>
-                                <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
-                            </template>
-                            <template v-else>
-                                <el-form-item class="form_cont">
-                                    <el-input
-                                        v-model="controlData.config.optionsFun"
-                                        :placeholder="
-                                            getOptionPlaceholder(controlData.config.optionsType)
-                                        "
-                                    >
-                                        <template
-                                            v-if="controlData.config.optionsType === 1"
-                                            #prepend
-                                        >
-                                            <el-select
-                                                v-model="controlData.config.method"
-                                                style="width: 80px"
-                                            >
-                                                <el-option label="get" value="get" />
-                                                <el-option label="post" value="post" />
-                                            </el-select>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                                <template v-if="controlData.config.optionsType === 1">
-                                    <el-form-item label="指定label属性值" class="form_cont">
-                                        <el-input
-                                            v-model="controlData.config.label"
-                                            placeholder="返回数据中没有label时可设置"
-                                        />
-                                    </el-form-item>
-                                    <el-form-item label="指定value属性值" class="form_cont">
-                                        <el-input
-                                            v-model="controlData.config.value"
-                                            placeholder="返回数据中没有value时可设置"
-                                        />
-                                    </el-form-item>
-                                </template>
-                                <el-form-item v-if="controlData.config.optionsType === 1" class="form_cont">
-                                    <el-button
-                                        @click="
-                                            optionsEvent(
-                                            'optionsParams',
-                                            '请求前处理事件，参数(data,route,form) data请求参数,route页面路由,form表单值'
-                                            )
-                                        "
-                                    >beforeRequest</el-button>
-                                    <el-button
-                                        @click="
-                                            optionsEvent(
-                                            'optionsResult',
-                                            '请求返回结束处理；，也可为字符串，如opt=formatTest'
-                                            )
-                                        "
-                                    >afterResponse</el-button>
-                                </el-form-item>
-                            </template>
-                            <el-form-item label="尝试转换value值为" class="form_cont">
-                                <el-select
-                                    v-model="controlData.config.transformData"
-                                    placeholder="默认为number"
-                                >
-                                    <el-option value="none">不转换</el-option>
-                                    <el-option value="number">number</el-option>
-                                    <el-option value="string">string</el-option>
-                                </el-select>
-                            </el-form-item>
-                        </div>
-                        <template
-                            v-if="
-                            !state.isSearch &&
-                            showHide([
-                                'txt',
-                                'title',
-                                'table',
-                                'grid',
-                                'tabs',
-                                'card',
-                                'switch',
-                                'gridChild',
-                                'tableColumn',
-                                'divider',
-                                'div',
-                                'button'
-                            ])
-                            "
+                  <el-col :span="2" :offset="1">
+                    <i class="icon-del" @click="delSelectOption(index as number)"></i>
+                  </el-col>
+                </el-form-item>
+              </div>
+              <!-- 多选选择框选项拖动功能 liwenxuan 20240815 start -->
+              <div
+                v-if="controlData.type !== 'cascader' && controlData.type == 'checkbox'"
+              >
+                <draggable
+                  :list="controlData.options"
+                  :force-fallback="true"
+                  chosen-class="chosenClass"
+                  animation="300"
+                >
+                  <template #item="{ element }">
+                    <div class="item form_cont">
+                      <el-form-item>
+                        <el-col
+                          :span="2"
+                          style="padding-top: 4px; cursor: move; color: #66b1ff"
                         >
-                        
-                            <!-- <div class="h3"><h3>校验设置</h3></div> -->
-                            <el-divider content-position="left">校验设置</el-divider>
-                            <div v-if="showHide(['input', 'password', 'component','digitpage'], true)" class="jiaoYan">
-				
-							<el-form-item class="form_cont">
-								<el-input v-model="ValidateText.message" @input="requiredText" :placeholder="ValidateText.message">
-									<template #prepend>
-									必填
-									</template>
-									<template #append>
-										<el-checkbox v-model="ValidateText.checkbox" @change="requiredChangeSet"  />
-									</template>
-								</el-input>
-							</el-form-item>
-							<el-form-item  v-if="showHide(['input', 'password', 'component'], true)" class="form_cont">
-								<el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
-									<el-input v-for="item in textUinrVerfy" v-model="item.message" @input="requiredTextRadio(item)" :placeholder="item.message" class="radioInput">
-										<template #prepend>
-											{{item.label}}
-										</template>
-										<template #append>
-											<el-radio :value="item.type" />
-										</template>
-									</el-input>
-								</el-radio-group>
-							</el-form-item>
-							<el-form-item v-else class="form_cont">
-								<el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
-									<el-input v-for="item in numberUinrVerfy" v-model="item.message" @input="requiredTextRadio(item)" :placeholder="item.message" class="radioInput">
-										<template #prepend>
-											{{item.label}}
-										</template>
-										<template #append>
-											<el-radio :value="item.type" />
-										</template>
-									</el-input>
-								</el-radio-group>
-							</el-form-item>
-
-                                <!-- <el-form-item
+                          <i class="icon-move"></i>
+                        </el-col>
+                        <el-col :span="6" style="cursor: move"> 选项标签 </el-col>
+                        <el-col :span="10">
+                          <el-input v-model="element.label" placeholder="选项标签" />
+                        </el-col>
+                        <el-col :span="2" :offset="1">
+                          <i
+                            class="icon-del"
+                            @click="delSelectOption(element.value as number)"
+                          ></i>
+                        </el-col>
+                      </el-form-item>
+                    </div>
+                  </template>
+                </draggable>
+              </div>
+              <!-- 多选选择框选项拖动功能 liwenxuan 20240815 end -->
+              <el-form-item class="form_cont">
+                <el-button @click="addSelectOption">{{
+                  controlData.type === "cascader" ? "编辑" : "新增"
+                }}</el-button>
+              </el-form-item>
+            </template>
+            <template v-else-if="controlData.config.optionsType === 3">
+              <el-button
+                type="primary"
+                style="margin-bottom: 10px; margin-left: 80px"
+                plain
+                @click="optionsValue3Setting"
+                >选择系统表单字段</el-button
+              >
+              <!--  <el-button  style="padding-top: 5px;" type="primary" link append-to-body="true" modal="true" @click="optionsValue3Setting"  >选择系统表单字段</el-button> -->
+            </template>
+            <template v-else>
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="controlData.config.optionsFun"
+                  :placeholder="getOptionPlaceholder(controlData.config.optionsType)"
+                >
+                  <template v-if="controlData.config.optionsType === 1" #prepend>
+                    <el-select v-model="controlData.config.method" style="width: 80px">
+                      <el-option label="get" value="get" />
+                      <el-option label="post" value="post" />
+                    </el-select>
+                  </template>
+                </el-input>
+              </el-form-item>
+              <template v-if="controlData.config.optionsType === 1">
+                <el-form-item label="指定label属性值" class="form_cont">
+                  <el-input
+                    v-model="controlData.config.label"
+                    placeholder="返回数据中没有label时可设置"
+                  />
+                </el-form-item>
+                <el-form-item label="指定value属性值" class="form_cont">
+                  <el-input
+                    v-model="controlData.config.value"
+                    placeholder="返回数据中没有value时可设置"
+                  />
+                </el-form-item>
+              </template>
+              <el-form-item v-if="controlData.config.optionsType === 1" class="form_cont">
+                <el-button
+                  @click="
+                    optionsEvent(
+                      'optionsParams',
+                      '请求前处理事件，参数(data,route,form) data请求参数,route页面路由,form表单值'
+                    )
+                  "
+                  >beforeRequest</el-button
+                >
+                <el-button
+                  @click="
+                    optionsEvent(
+                      'optionsResult',
+                      '请求返回结束处理；，也可为字符串，如opt=formatTest'
+                    )
+                  "
+                  >afterResponse</el-button
+                >
+              </el-form-item>
+            </template>
+            <el-form-item label="尝试转换value值为" class="form_cont">
+              <el-select
+                v-model="controlData.config.transformData"
+                placeholder="默认为number"
+              >
+                <el-option value="none">不转换</el-option>
+                <el-option value="number">number</el-option>
+                <el-option value="string">string</el-option>
+              </el-select>
+            </el-form-item>
+          </div>
+          <template
+            v-if="
+              !state.isSearch &&
+              showHide([
+                'txt',
+                'title',
+                'table',
+                'grid',
+                'tabs',
+                'card',
+                'switch',
+                'gridChild',
+                'tableColumn',
+                'divider',
+                'div',
+                'button',
+              ])
+            "
+          >
+            <!-- <div class="h3"><h3>校验设置</h3></div> -->
+            <el-divider content-position="left">校验设置</el-divider>
+            <div
+              v-if="showHide(['input', 'password', 'component', 'digitpage'], true)"
+              class="jiaoYan"
+            >
+              <el-form-item class="form_cont">
+                <el-input
+                  v-model="ValidateText.message"
+                  @input="requiredText"
+                  :placeholder="ValidateText.message"
+                >
+                  <template #prepend> 必填 </template>
+                  <template #append>
+                    <el-checkbox
+                      v-model="ValidateText.checkbox"
+                      @change="requiredChangeSet"
+                    />
+                  </template>
+                </el-input>
+              </el-form-item>
+              <el-form-item
+                v-if="showHide(['input', 'password', 'component'], true)"
+                class="form_cont"
+              >
+                <el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
+                  <el-input
+                    v-for="item in textUinrVerfy"
+                    v-model="item.message"
+                    @input="requiredTextRadio(item)"
+                    :placeholder="item.message"
+                    class="radioInput"
+                  >
+                    <template #prepend>
+                      {{ item.label }}
+                    </template>
+                    <template #append>
+                      <el-radio :value="item.type" />
+                    </template>
+                  </el-input>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-else class="form_cont">
+                <el-radio-group v-model="radioVerify.type" @change="radioChangeSet">
+                  <el-input
+                    v-for="item in numberUinrVerfy"
+                    v-model="item.message"
+                    @input="requiredTextRadio(item)"
+                    :placeholder="item.message"
+                    class="radioInput"
+                  >
+                    <template #prepend>
+                      {{ item.label }}
+                    </template>
+                    <template #append>
+                      <el-radio :value="item.type" />
+                    </template>
+                  </el-input>
+                </el-radio-group>
+              </el-form-item>
+
+              <!-- <el-form-item
                                     v-for="(item, index) in controlData.customRules"
                                     :key="item.type"
                                     class="form_cont"
@@ -4217,23 +4398,20 @@ const radioChangeSet = (val:any) => {
                                         </el-tooltip>
                                     </el-button>
                                 </el-form-item> -->
-                            </div>
-                            <el-form-item class="form_cont" v-else>
-							
-                            <el-checkbox
-                                :model-value="checkboxRequired"
-                                @change="requiredChange"
-                                >必填
-                            </el-checkbox>
-                            <el-input
-                                v-if="controlData.item?.rules && controlData.item?.rules[0]"
-                                v-model="controlData.item.rules[0].message"
-                                placeholder="自定义必填错误提示"
-                            />
-                            </el-form-item>
-                        </template>
-                        <!-- <div class="h3"><h3>其他属性</h3></div> -->
-                        <!-- <el-divider content-position="left">其他属性</el-divider>
+            </div>
+            <el-form-item class="form_cont" v-else>
+              <el-checkbox :model-value="checkboxRequired" @change="requiredChange"
+                >必填
+              </el-checkbox>
+              <el-input
+                v-if="controlData.item?.rules && controlData.item?.rules[0]"
+                v-model="controlData.item.rules[0].message"
+                placeholder="自定义必填错误提示"
+              />
+            </el-form-item>
+          </template>
+          <!-- <div class="h3"><h3>其他属性</h3></div> -->
+          <!-- <el-divider content-position="left">其他属性</el-divider>
                         <div v-if="showHide(['grid', 'card', 'gridChild', 'divider', 'div'])"  class="form_cont">
                             
     
@@ -4248,902 +4426,1190 @@ const radioChangeSet = (val:any) => {
                             </el-tooltip>
                             </el-button>
                         </div> -->
-                        <el-divider content-position="left">高级属性</el-divider>
-                       
-                        <LayoutPage v-if="cssIsShouw(attrList)"  v-model:styles-val="controlDataStyls" :place="controlData.type" />
-    
-    
-    
-    
-                    </el-form>
-                </el-tab-pane>
-                <el-tab-pane label="表单配置" name="second">
-                    <el-form size="small" class="form">
-                        <el-divider content-position="left">基础配置</el-divider>
-								<el-form-item v-if="formConfig.classify != 4"  class="form_cont">
-									<template #label>
-										归属分组
-									</template>
-									
-									<el-select id="groupForm" v-model="formConfig.groupKey" placeholder="Select" ref="groupForm">
-										<el-option v-for="item in formGroup.list" :key="item.idStr" :label="item.title" :value="item.idStr" />
-										<p v-if="loadingmore">加载中</p>
-										<p v-if="loadingnomore">无数据</p>
-									</el-select>
-								</el-form-item>
-                                <el-form-item
-                                    v-for="(item, index) in formAttr.filter(item => !item.hide)"
-                                    :label="item.label"
-                                    :key="index"
-                                    class="form_cont"
-                                >
-                                    <el-select
-                                        v-if="item.type === 'select'"
-                                        v-model="item.value"
-                                        :filterable="item.key === 'class'"
-                                        :allow-create="item.key === 'class'"
-                                        :placeholder="item.placeholder"
-                                        :clearable="item.clearable"
-                                        @change="formAttrChange(item)"
-                                    >
-                                        <el-option
-                                            
-                                            v-for="opt in item.options"
-                                            :key="opt.label || opt.name"
-                                            :label="opt.label || opt.name"
-                                            :value="formatNumber(opt.value ?? opt.id)"
-                                        />
-                                    </el-select>
-                                    <el-switch
-                                        v-else-if="item.type === 'switch'"
-                                        v-model="item.value"
-                                        @input="formAttrChange(item)"
-                                    />
-                                    <el-input
-                                        v-else
-                                        v-model="item.value"
-                                        :placeholder="item.placeholder"
-                                        :disabled="isNotWrite(item)"
-                                        @input="formAttrChange(item)"
-                                    />
-                                </el-form-item>
-								
-								<el-form-item  class="form_cont">
-									<template #label>
-										表单图标
-									</template>
-									<el-upload
-										class="avatar-uploader"
-										:action="imgUploadApiUrl"
-										:show-file-list="false"
-										:on-success="handleAvatarSuccess"
-										:before-upload="beforeAvatarUpload"
-									>
-										<img v-if="formConfig.imageUrl" :src="formConfig.imageUrl" class="avatar" />
-										<el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
-									</el-upload>
-								</el-form-item>
-                                <el-form-item class="form_cont" label="数据标题">
-                                    
-                                    
-                                    <el-tree-select
-                                        v-model="formData.dataTitle"
-                                        multiple
-                                        clearable
-                                        collapse-tags
-                                        :data="associatedFormsCurrentFormFieldTreeNoTable"
-                                        :render-after-expand="false"
-                                        style="width: 240px"
-                                    />
-                                    
-                                </el-form-item>
-                        
-                       
-                        <el-divider content-position="left">表单整体布局</el-divider>
-                        <el-form-item label="组件尺寸" class="form_cont">
-                            <el-radio-group v-model="formData.size">
-                                <el-radio-button label="large">大</el-radio-button>
-                                <el-radio-button label="default">适中</el-radio-button>
-                                <el-radio-button label="small">小</el-radio-button>
-                            </el-radio-group>
-                        </el-form-item>
-                        <el-form-item label="表单样式名称" class="form_cont">
-                            <el-select
-                                v-model="formData.class"
-                                class="m-2"
-                                placeholder="额外添加的表单class类名"
-                            >
-                                <el-option
-                                v-for="item in optionsCss"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value"
-                                />
-                            </el-select>
-                        </el-form-item>
-                            <el-form-item label="行内表单模式" class="form_cont">
-                            <el-switch v-model="formData.inline" active-text="开启" inactive-text="关闭" />
-                            </el-form-item>
-                            <el-form-item label="标签宽度" class="form_cont">
-                            <el-input v-model="formData.labelWidth" clearable placeholder="表单标签宽度">
-                                <template #append >PX</template>
-                            </el-input>
-                            </el-form-item>
-                            <el-form-item label="标签后缀" class="form_cont">
-                            <el-input v-model="formData.labelSuffix" placeholder="表单标签后缀" />
-                            </el-form-item>
-                            <el-form-item label="表单标签对齐方式" class="form_cont">
-                            <el-radio-group v-model="formData.labelPosition">
-                                <el-radio-button label="left">左</el-radio-button>
-                                <el-radio-button label="right">右</el-radio-button>
-                                <el-radio-button label="top">上</el-radio-button>
-                            </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="必填项星号位置" class="form_cont">
-                            <el-radio-group v-model="formData.requireAsteriskPosition">
-                                <el-radio-button label="left">左</el-radio-button>
-                                <el-radio-button label="right">右</el-radio-button>
-                            </el-radio-group>
-                            </el-form-item>
-                            <el-form-item label="是否隐藏星号" class="form_cont">
-                            <el-switch v-model="formData.hideRequiredAsterisk" active-text="隐藏" inactive-text="显示" style="--el-switch-on-color: #ff4949; --el-switch-off-color: #13ce66" />
-                            </el-form-item>
-                            <el-form-item label="校验错误信息" class="form_cont">
-                            <el-switch v-model="formData.showMessage" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                            <el-form-item label="行内展示校验信息" class="form_cont">
-                            <el-switch v-model="formData.inlineMessage" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                            <el-form-item label="校验结果反馈图标" class="form_cont">
-                            <el-switch v-model="formData.statusIcon" active-text="显示" inactive-text="隐藏" />
-                            </el-form-item>
-                        <el-divider content-position="left">表单功能补充</el-divider>
-                        <el-form-item class="form_cont">
-                            <el-button @click="editFormStyle(state.tooltip.css)"
-                            >
-                                编辑表单样式
-                                <el-tooltip :content="state.tooltip.css" placement="top">
-                                    <el-icon>
-                                        <QuestionFilled />
-                                    </el-icon>
-                                </el-tooltip>
-                            </el-button>
-                            <el-button @click="editFormDict(state.tooltip.dict)"
-                            >
-                                设置数据字典
-                                <el-tooltip :content="state.tooltip.dict" placement="top">
-                                    <el-icon>
-                                        <QuestionFilled />
-                                    </el-icon>
-                                </el-tooltip>
-                            </el-button>
-                        </el-form-item>
-						<template v-if="!state.isSearch">
-                            <el-divider content-position="left">接口数据事件</el-divider>
-    
-                            <el-form-item v-if="!state.isSearch" class="form_cont">
-                                <template #label
-                                >
-                                    添加时获取请求
-                                    <el-tooltip
-                                        content="新增表单数据时，从接口获取新增初始数据"
-                                        placement="top"
-                                    >
-                                        <el-icon>
-                                            <QuestionFilled />
-                                        </el-icon>
-                                    </el-tooltip>
-                                </template>
-                                <el-switch
-                                    v-model="formConfig.addLoad"
-                                    @change="
-                                        formAttrChange({ key: 'addLoad', path: 'config' }, $event)
-                                    "
-                                />
-                            </el-form-item>
-                            <el-form-item label="新增数据保存url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.addUrl"
-                                    placeholder="表单提交的url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item label="修改数据保存url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.editUrl"
-                                    placeholder="修改提交的url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item label="获取表单数据url" class="form_cont">
-                                <el-input
-                                    v-model="formConfig.requestUrl"
-                                    placeholder="获取表单数据url，非特殊不需要设置"
-                                />
-                            </el-form-item>
-                            <el-form-item class="event-btn form_cont">
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'beforeRequest',
-                                        '获取表单初始数据前事件，可修改请求参数'
-                                    )
-                                    "
-                                    >beforeRequest
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'afterResponse',
-                                        '获取表单初始数据后事件，可对请求返回数据进行处理；也可为字符串，如opt=formatTest'
-                                    )
-                                    "
-                                    >afterResponse
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'beforeSubmit',
-                                        '表单数据提交前事件，可对提交数据进行处理；也可为字符串，如opt=formatTest'
-                                    )
-                                    "
-                                    >beforeSubmit
-                                </el-button>
-                                <el-button
-                                    @click="eventClick('afterSubmit', '表单数据提交成功事件')"
-                                    >afterSubmit
-                                </el-button>
-                                <el-button
-                                    @click="
-                                    eventClick(
-                                        'change',
-                                        '表单组件值改变事件。当表单某值改变时，可修改其他组件的值；也可为字符串，如opt=formChange,字符串即为/utils/formChangeValue(name,model,key)中的key值'
-                                    )
-                                    "
-                                    >表单组件改变事件change
-                                </el-button>
-                            </el-form-item>
-                        </template>
-                    </el-form>
-                </el-tab-pane>
-            </el-tabs>
-    
-            
-    
-        </div>
-        <!-- 轮播图设置弹窗 20240122 start -->
-        
-            <el-dialog v-model="dialogTableVisible" title="轮播图设置" top="20px" style="margin-top:70px,margin-left:270px">
-                <div v-if="controlData.type=='lowcodeCarsusel'" style="margin-bottom: 30px;">
-                    <span style="margin-right: 10px;">轮播图宽度(像素):</span><el-input-number v-model="controlData.control.config.carsuselWidth" :step="64" :max="4096" :min="178"/>
-                    <span style="margin-left:15px;margin-right: 10px;">轮播图高度(像素):</span><el-input-number v-model="controlData.control.config.carsuselHeight" :step="36" :max="4096" :min="100"/>
-                    <span style="margin-left:15px;margin-right: 10px;">切图间隔(毫秒):</span><el-input-number v-model="controlData.control.config.interval" :step="200"/>
-                </div>
-            <el-table v-if="controlData.type=='lowcodeCarsusel'" :data="controlData.control.carsuselConfigArr" border style="width: 100%" row-key="imgId">
-                <el-table-column  label="设置图片" width="180" >
-                    <template #default="propFlag">
-                        <el-upload 
-                        :action="uploadUrl"  :before-remove="beforeRemove"
-                        :on-success="carouselImgUploadSuccess" 
-                        :on-error="videoUploadErr"
-                        :limit="1"
-                        accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign">
-                            <el-button v-if="!propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">点此上传</el-button>
-                            <el-button v-if="propFlag.row.uploadFlag" type="primary" @click="changeCurrentUploadImgid(propFlag.row)">已上传,点击修改</el-button>
-                        </el-upload>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="imgUrl" label="查看图片" width="180">
-                    <template #default="imgScope">
-                        <!-- {{ imgScope.row.imgUrl }} -->
-                        
-                        <el-image style="width: 100px; height: 100px;cursor:pointer;" :src="imgScope.row.imgUrl" fit="contain" alt="暂未上传" @click="handlePreview(imgScope.$index, imgScope.row)" >
-                            <template #error>
-                                <div class="image-slot">
-                                    <el-image style="width: 100px; height: 100px;" :src="errimg" fit="contain" ></el-image>
-                                </div>
-                            </template>
-                        </el-image>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="link" label="链接地址">
-                    <template #default="linkScope">
-                        
-                        <el-input v-model="linkScope.row.link"  placeholder="输入图片的链接地址" />
-                    </template>
-                </el-table-column>
-                <el-table-column fixed="right" label="操作（增/删）" width="120" >
-                    
-                    <template #default="scope">
-                        
-                            <el-button v-if="controlData.control.carsuselConfigArr.length>1" type="danger" :icon="Delete" circle @click="deleteRow(scope.row)"/>
-                        
-                            <el-button v-if="controlData.control.carsuselConfigArr[controlData.control.carsuselConfigArr.length-1].imgId == scope.row.imgId" type="success" :icon="Plus" circle @click="createRow(scope.row)" />
-                        
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
-        <!-- 图片预览 -->
-        <el-image-viewer
-        v-if="showImagePreview"
-        :zoom-rate="1.2"
-        :url-list="carouselImgUrlList"
-        @close="closePreview"
-        />
-        
-
-	<el-dialog v-model="transferDialogTableVisible" title="创建穿梭框选项树" top="150px" style="margin-top:70px;" width="50%" >
-		<div v-if="controlData.type=='lowcodeTransfer'">
-			<el-button type="success" plain style="margin-top: 5px;margin-bottom: 5px;" @click="addRootNode()">新增根节点</el-button>
-			
-			<!-- 建立树 -->
-			<div class="custom-tree-container">
-				
-				<el-tree
-				
-				:data="controlData.control.fixedOptions"
-				show-checkbox
-				node-key="id"
-				:default-expand-all = "false"
-				:expand-on-click-node="true"
-				>
-				<template #default="{ node, data }">
-					<span class="custom-tree-node">
-					<span>{{ node.label }}</span>
-					<span style="float: right;">
-						<a style="color: green;" @click="append(data)"> 新增子节点 </a>
-						<a style="margin-left: 8px;" @click="changeLabel(node,data)"> 编辑节点名 </a>
-						<a style="margin-left: 8px;color: orange;" @click="setNodeEnable(node,data)"> 设为可选/不可选 </a>
-						<a style="margin-left: 8px;color: red;" @click="remove(node, data)"> 删除本节点 </a>
-					</span>
-					</span>
-				</template>
-				</el-tree>
-			</div>
-			
-		</div>
-	</el-dialog>
-	<!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->
-
-
-	<!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
-
-
-
-    <el-dialog  v-model="associatedFormsChooseDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择关联表单" :show-close="false" style="margin-top:70px;" width="50%" >
-        <template v-if="controlData.type=='associatedForms'">
-            <div style="display:flex;margin-bottom: 2px;margin-top:28px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
-                <el-tree-select
-                    v-model="controlData.control.formid"
-                    style="width: 390px;"
-                    :data="customerFormTree[0].children"
-                    check-strictly
-                    :render-after-expand="false"
-                    filterable
-                    node-key="id"
-                    @change="formidChanged"
-                />
-            </div>
-            
-        </template>
-        <template #footer>
-        <div class="dialog-footer">
-            <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
-            确定
+          <el-divider content-position="left">高级属性</el-divider>
+
+          <LayoutPage
+            v-if="cssIsShouw(attrList)"
+            v-model:styles-val="controlDataStyls"
+            :place="controlData.type"
+          />
+        </el-form>
+      </el-tab-pane>
+      <el-tab-pane label="表单配置" name="second">
+        <el-form size="small" class="form">
+          <el-divider content-position="left">基础配置</el-divider>
+          <el-form-item v-if="formConfig.classify != 4" class="form_cont">
+            <template #label> 归属分组 </template>
+
+            <el-select
+              id="groupForm"
+              v-model="formConfig.groupKey"
+              placeholder="Select"
+              ref="groupForm"
+            >
+              <el-option
+                v-for="item in formGroup.list"
+                :key="item.idStr"
+                :label="item.title"
+                :value="item.idStr"
+              />
+              <p v-if="loadingmore">加载中</p>
+              <p v-if="loadingnomore">无数据</p>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-for="(item, index) in formAttr.filter((item) => !item.hide)"
+            :label="item.label"
+            :key="index"
+            class="form_cont"
+          >
+            <el-select
+              v-if="item.type === 'select'"
+              v-model="item.value"
+              :filterable="item.key === 'class'"
+              :allow-create="item.key === 'class'"
+              :placeholder="item.placeholder"
+              :clearable="item.clearable"
+              @change="formAttrChange(item)"
+            >
+              <el-option
+                v-for="opt in item.options"
+                :key="opt.label || opt.name"
+                :label="opt.label || opt.name"
+                :value="formatNumber(opt.value ?? opt.id)"
+              />
+            </el-select>
+            <el-switch
+              v-else-if="item.type === 'switch'"
+              v-model="item.value"
+              @input="formAttrChange(item)"
+            />
+            <el-input
+              v-else
+              v-model="item.value"
+              :placeholder="item.placeholder"
+              :disabled="isNotWrite(item)"
+              @input="formAttrChange(item)"
+            />
+          </el-form-item>
+
+          <el-form-item class="form_cont">
+            <template #label> 表单图标 </template>
+            <el-upload
+              class="avatar-uploader"
+              :action="imgUploadApiUrl"
+              :show-file-list="false"
+              :on-success="handleAvatarSuccess"
+              :before-upload="beforeAvatarUpload"
+            >
+              <img v-if="formConfig.imageUrl" :src="formConfig.imageUrl" class="avatar" />
+              <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+            </el-upload>
+          </el-form-item>
+          <el-form-item class="form_cont" label="数据标题">
+            <el-tree-select
+              v-model="formData.dataTitle"
+              multiple
+              clearable
+              collapse-tags
+              :data="associatedFormsCurrentFormFieldTreeNoTable"
+              :render-after-expand="false"
+              style="width: 240px"
+            />
+          </el-form-item>
+
+          <el-divider content-position="left">表单整体布局</el-divider>
+          <el-form-item label="组件尺寸" class="form_cont">
+            <el-radio-group v-model="formData.size">
+              <el-radio-button label="large">大</el-radio-button>
+              <el-radio-button label="default">适中</el-radio-button>
+              <el-radio-button label="small">小</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="表单样式名称" class="form_cont">
+            <el-select
+              v-model="formData.class"
+              class="m-2"
+              placeholder="额外添加的表单class类名"
+            >
+              <el-option
+                v-for="item in optionsCss"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="行内表单模式" class="form_cont">
+            <el-switch
+              v-model="formData.inline"
+              active-text="开启"
+              inactive-text="关闭"
+            />
+          </el-form-item>
+          <el-form-item label="标签宽度" class="form_cont">
+            <el-input v-model="formData.labelWidth" clearable placeholder="表单标签宽度">
+              <template #append>PX</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="标签后缀" class="form_cont">
+            <el-input v-model="formData.labelSuffix" placeholder="表单标签后缀" />
+          </el-form-item>
+          <el-form-item label="表单标签对齐方式" class="form_cont">
+            <el-radio-group v-model="formData.labelPosition">
+              <el-radio-button label="left">左</el-radio-button>
+              <el-radio-button label="right">右</el-radio-button>
+              <el-radio-button label="top">上</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="必填项星号位置" class="form_cont">
+            <el-radio-group v-model="formData.requireAsteriskPosition">
+              <el-radio-button label="left">左</el-radio-button>
+              <el-radio-button label="right">右</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="是否隐藏星号" class="form_cont">
+            <el-switch
+              v-model="formData.hideRequiredAsterisk"
+              active-text="隐藏"
+              inactive-text="显示"
+              style="--el-switch-on-color: #ff4949; --el-switch-off-color: #13ce66"
+            />
+          </el-form-item>
+          <el-form-item label="校验错误信息" class="form_cont">
+            <el-switch
+              v-model="formData.showMessage"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-form-item label="行内展示校验信息" class="form_cont">
+            <el-switch
+              v-model="formData.inlineMessage"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-form-item label="校验结果反馈图标" class="form_cont">
+            <el-switch
+              v-model="formData.statusIcon"
+              active-text="显示"
+              inactive-text="隐藏"
+            />
+          </el-form-item>
+          <el-divider content-position="left">表单功能补充</el-divider>
+          <el-form-item class="form_cont">
+            <el-button @click="editFormStyle(state.tooltip.css)">
+              编辑表单样式
+              <el-tooltip :content="state.tooltip.css" placement="top">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
             </el-button>
-        </div>
-        </template> 
-    </el-dialog>
-
-    
-
-	<el-dialog v-model="associatedFormsHideDialogFlag" title="隐藏条件" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
-		
-		<template v-if="controlData.type=='associatedForms'">
-			<div class="common-layout">
-				<el-container>
-				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-					<!-- <el-input
+            <el-button @click="editFormDict(state.tooltip.dict)">
+              设置数据字典
+              <el-tooltip :content="state.tooltip.dict" placement="top">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </el-button>
+          </el-form-item>
+          <template v-if="!state.isSearch">
+            <el-divider content-position="left">接口数据事件</el-divider>
+
+            <el-form-item v-if="!state.isSearch" class="form_cont">
+              <template #label>
+                添加时获取请求
+                <el-tooltip
+                  content="新增表单数据时，从接口获取新增初始数据"
+                  placement="top"
+                >
+                  <el-icon>
+                    <QuestionFilled />
+                  </el-icon>
+                </el-tooltip>
+              </template>
+              <el-switch
+                v-model="formConfig.addLoad"
+                @change="formAttrChange({ key: 'addLoad', path: 'config' }, $event)"
+              />
+            </el-form-item>
+            <el-form-item label="新增数据保存url" class="form_cont">
+              <el-input
+                v-model="formConfig.addUrl"
+                placeholder="表单提交的url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item label="修改数据保存url" class="form_cont">
+              <el-input
+                v-model="formConfig.editUrl"
+                placeholder="修改提交的url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item label="获取表单数据url" class="form_cont">
+              <el-input
+                v-model="formConfig.requestUrl"
+                placeholder="获取表单数据url，非特殊不需要设置"
+              />
+            </el-form-item>
+            <el-form-item class="event-btn form_cont">
+              <el-button
+                @click="
+                  eventClick('beforeRequest', '获取表单初始数据前事件，可修改请求参数')
+                "
+                >beforeRequest
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'afterResponse',
+                    '获取表单初始数据后事件，可对请求返回数据进行处理；也可为字符串，如opt=formatTest'
+                  )
+                "
+                >afterResponse
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'beforeSubmit',
+                    '表单数据提交前事件，可对提交数据进行处理；也可为字符串，如opt=formatTest'
+                  )
+                "
+                >beforeSubmit
+              </el-button>
+              <el-button @click="eventClick('afterSubmit', '表单数据提交成功事件')"
+                >afterSubmit
+              </el-button>
+              <el-button
+                @click="
+                  eventClick(
+                    'change',
+                    '表单组件值改变事件。当表单某值改变时，可修改其他组件的值；也可为字符串，如opt=formChange,字符串即为/utils/formChangeValue(name,model,key)中的key值'
+                  )
+                "
+                >表单组件改变事件change
+              </el-button>
+            </el-form-item>
+          </template>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+  <!-- 轮播图设置弹窗 20240122 start -->
+
+  <el-dialog
+    v-model="dialogTableVisible"
+    title="轮播图设置"
+    top="20px"
+    style="margin-top:70px,margin-left:270px"
+  >
+    <div v-if="controlData.type == 'lowcodeCarsusel'" style="margin-bottom: 30px">
+      <span style="margin-right: 10px">轮播图宽度(像素):</span
+      ><el-input-number
+        v-model="controlData.control.config.carsuselWidth"
+        :step="64"
+        :max="4096"
+        :min="178"
+      />
+      <span style="margin-left: 15px; margin-right: 10px">轮播图高度(像素):</span
+      ><el-input-number
+        v-model="controlData.control.config.carsuselHeight"
+        :step="36"
+        :max="4096"
+        :min="100"
+      />
+      <span style="margin-left: 15px; margin-right: 10px">切图间隔(毫秒):</span
+      ><el-input-number v-model="controlData.control.config.interval" :step="200" />
+    </div>
+    <el-table
+      v-if="controlData.type == 'lowcodeCarsusel'"
+      :data="controlData.control.carsuselConfigArr"
+      border
+      style="width: 100%"
+      row-key="imgId"
+    >
+      <el-table-column label="设置图片" width="180">
+        <template #default="propFlag">
+          <el-upload
+            :action="uploadUrl"
+            :before-remove="beforeRemove"
+            :on-success="carouselImgUploadSuccess"
+            :on-error="videoUploadErr"
+            :limit="1"
+            accept=".jpg,.jpeg,.png,.tif,.tga,.bmp,.dds,.svg,.eps,.pdf,.hdr,.raw,.exr,.psd,.afphoto,.afdesign"
+          >
+            <el-button
+              v-if="!propFlag.row.uploadFlag"
+              type="primary"
+              @click="changeCurrentUploadImgid(propFlag.row)"
+              >点此上传</el-button
+            >
+            <el-button
+              v-if="propFlag.row.uploadFlag"
+              type="primary"
+              @click="changeCurrentUploadImgid(propFlag.row)"
+              >已上传,点击修改</el-button
+            >
+          </el-upload>
+        </template>
+      </el-table-column>
+      <el-table-column prop="imgUrl" label="查看图片" width="180">
+        <template #default="imgScope">
+          <!-- {{ imgScope.row.imgUrl }} -->
+
+          <el-image
+            style="width: 100px; height: 100px; cursor: pointer"
+            :src="imgScope.row.imgUrl"
+            fit="contain"
+            alt="暂未上传"
+            @click="handlePreview(imgScope.$index, imgScope.row)"
+          >
+            <template #error>
+              <div class="image-slot">
+                <el-image
+                  style="width: 100px; height: 100px"
+                  :src="errimg"
+                  fit="contain"
+                ></el-image>
+              </div>
+            </template>
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column prop="link" label="链接地址">
+        <template #default="linkScope">
+          <el-input v-model="linkScope.row.link" placeholder="输入图片的链接地址" />
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作（增/删）" width="120">
+        <template #default="scope">
+          <el-button
+            v-if="controlData.control.carsuselConfigArr.length > 1"
+            type="danger"
+            :icon="Delete"
+            circle
+            @click="deleteRow(scope.row)"
+          />
+
+          <el-button
+            v-if="
+              controlData.control.carsuselConfigArr[
+                controlData.control.carsuselConfigArr.length - 1
+              ].imgId == scope.row.imgId
+            "
+            type="success"
+            :icon="Plus"
+            circle
+            @click="createRow(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-dialog>
+  <!-- 图片预览 -->
+  <el-image-viewer
+    v-if="showImagePreview"
+    :zoom-rate="1.2"
+    :url-list="carouselImgUrlList"
+    @close="closePreview"
+  />
+
+  <el-dialog
+    v-model="transferDialogTableVisible"
+    title="创建穿梭框选项树"
+    top="150px"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <div v-if="controlData.type == 'lowcodeTransfer'">
+      <el-button
+        type="success"
+        plain
+        style="margin-top: 5px; margin-bottom: 5px"
+        @click="addRootNode()"
+        >新增根节点</el-button
+      >
+
+      <!-- 建立树 -->
+      <div class="custom-tree-container">
+        <el-tree
+          :data="controlData.control.fixedOptions"
+          show-checkbox
+          node-key="id"
+          :default-expand-all="false"
+          :expand-on-click-node="true"
+        >
+          <template #default="{ node, data }">
+            <span class="custom-tree-node">
+              <span>{{ node.label }}</span>
+              <span style="float: right">
+                <a style="color: green" @click="append(data)"> 新增子节点 </a>
+                <a style="margin-left: 8px" @click="changeLabel(node, data)">
+                  编辑节点名
+                </a>
+                <a
+                  style="margin-left: 8px; color: orange"
+                  @click="setNodeEnable(node, data)"
+                >
+                  设为可选/不可选
+                </a>
+                <a style="margin-left: 8px; color: red" @click="remove(node, data)">
+                  删除本节点
+                </a>
+              </span>
+            </span>
+          </template>
+        </el-tree>
+      </div>
+    </div>
+  </el-dialog>
+  <!-- 穿梭框设置弹窗 liwenxuan 20240217 end -->
+
+  <!-- 关联表单设置弹窗 liwenxuan 20240402 start -->
+
+  <el-dialog
+    v-model="associatedFormsChooseDialogFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    title="选择关联表单"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div style="display: flex; margin-bottom: 2px; margin-top: 28px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择表单</span
+        >
+        <el-tree-select
+          v-model="controlData.control.formid"
+          style="width: 390px"
+          :data="customerFormTree[0].children"
+          check-strictly
+          :render-after-expand="false"
+          filterable
+          node-key="id"
+          @change="formidChanged"
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineAssociatedFormsChooseDialog">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="associatedFormsHideDialogFlag"
+    title="隐藏条件"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 500px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div class="common-layout">
+        <el-container>
+          <el-aside
+            width="300px"
+            style="height: 420px; border: 1px solid gainsboro; margin-right: 5px"
+          >
+            <!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="请先保存当前表单"
-						:data="associatedFormsCurrentFormFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						
-						@node-contextmenu="handleFieldTreeContextmenu"
-						
-						
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="请先保存当前表单"
+              :data="associatedFormsCurrentFormFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenu"
+            />
+            <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="orgTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="orgAndManTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleOrgTreeExpand"
-						@node-collapse="handleOrgTreeCollapse"
-						
-						@node-contextmenu="handleOrgTreeContextmenu"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="orgTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="orgAndManTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleOrgTreeExpand"
+              @node-collapse="handleOrgTreeCollapse"
+              @node-contextmenu="handleOrgTreeContextmenu"
+            />
+            <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="roleTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="roleTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleRoleTreeExpand"
-						@node-collapse="handleRoleTreeCollapse"
-						
-						@node-contextmenu="handleRoleTreeContextmenu"
-					/>
-				</el-aside>
-				<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
-					<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">当满足以下条件时此控件隐藏</div>
-					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-                        <AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
-                        <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
+            <el-tree
+              ref="roleTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="roleTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleRoleTreeExpand"
+              @node-collapse="handleRoleTreeCollapse"
+              @node-contextmenu="handleRoleTreeContextmenu"
+            />
+          </el-aside>
+          <el-main
+            style="border: 1px solid gainsboro; padding: 3px"
+            class="associatedFormsHideDialogMain"
+          >
+            <div
+              style="
+                border: 1px solid gainsboro;
+                height: 7%;
+                border-bottom: 0px;
+                padding-top: 3px;
+                padding-left: 5px;
+                background-color: #e6f3fe;
+              "
+            >
+              当满足以下条件时此控件隐藏
+            </div>
+            <div
+              id="associatedFormsHideEditArea"
+              style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px"
+            >
+              <AssociatedFormsTinyace
+                ref="aft"
+                :aft-text="controlData.control.hideConditionHtml"
+                :aft-text-copy="controlData.control.hideConditionHtmlCopy"
+                @text-change="aftTextChanged"
+                @gongshi-change="aftGongshiChanged"
+              ></AssociatedFormsTinyace>
+              <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
                             <span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
                         </div> -->
-                        
-                    </div>
-					<div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
-                        <ul>
-                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
-                            <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
-                            <li>参考举例：</li>
-                            <span style="margin-left: 14px;">年龄>10</span><br>
-                            <span style="margin-left: 14px;">企管部包含当前用户</span><br>
-                            <span style="margin-left: 14px;">绩效考核执行人包含当前用户</span><br>
-                            <span style="margin-left: 14px;">张三!=当前用户</span>
-                        </ul>
-                    </div>
-				</el-main>
-				</el-container>
-			</div>
-		</template>
-		<template #footer>
-		<div class="dialog-footer">
-			<el-button @click="asfhTextCancel">取消</el-button>
-			<el-button type="primary" @click="handleDetermine">
-			确定
-			</el-button>
-		</div>
+            </div>
+            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px">
+              <ul>
+                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                <li>
+                  支持的符号：<span style="color: red"
+                    >'==', '>=', '>', '<=', '<', '!='</span
+                  >
+                </li>
+                <li>
+                  支持<span style="color: red">"包含,不包含,当前用户"</span
+                  >关键字,用于组织机构条件和角色条件
+                </li>
+                <li>参考举例：</li>
+                <span style="margin-left: 14px">年龄>10</span
+                ><br />
+                <span style="margin-left: 14px">企管部包含当前用户</span
+                ><br />
+                <span style="margin-left: 14px">绩效考核执行人包含当前用户</span
+                ><br />
+                <span style="margin-left: 14px">张三!=当前用户</span>
+              </ul>
+            </div>
+          </el-main>
+        </el-container>
+      </div>
     </template>
-	</el-dialog>
-
-
-<!-- 数据范围编辑弹窗 -->
-
-    <el-dialog v-model="associatedFormsDataRangeDialogFlag" title="数据范围" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 500px" width="50%"  >
-		
-		<template v-if="controlData.type=='associatedForms'">
-			<div class="common-layout">
-				<el-container>
-				<el-aside width="300px" style="height:420px;border: 1px solid gainsboro;margin-right: 5px;">
-
-
-                    <el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="选择关联的表单后展示"
-						:data="asfasfFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/>
-					<!-- <el-input
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="asfhTextCancel">取消</el-button>
+        <el-button type="primary" @click="handleDetermine"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 数据范围编辑弹窗 -->
+
+  <el-dialog
+    v-model="associatedFormsDataRangeDialogFlag"
+    title="数据范围"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 500px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <div class="common-layout">
+        <el-container>
+          <el-aside
+            width="300px"
+            style="height: 420px; border: 1px solid gainsboro; margin-right: 5px"
+          >
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="选择关联的表单后展示"
+              :data="asfasfFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="fieldTreeSearchFlag"
 						v-model="fieldTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-						ref="fieldTreeRef"
-                        node-key="id"
-                        empty-text="请先保存当前表单"
-						:data="associatedFormsCurrentFormFieldTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						@node-expand="handleFieldTreeExpand"
-						@node-collapse="handleFieldTreeCollapse"
-						@node-contextmenu="handleFieldTreeContextmenuRange"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="fieldTreeRef"
+              node-key="id"
+              empty-text="请先保存当前表单"
+              :data="associatedFormsCurrentFormFieldTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              @node-expand="handleFieldTreeExpand"
+              @node-collapse="handleFieldTreeCollapse"
+              @node-contextmenu="handleFieldTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="orgTreeSearchFlag"
 						v-model="orgTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="orgTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="orgAndManTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleOrgTreeExpand"
-						@node-collapse="handleOrgTreeCollapse"
-						
-						@node-contextmenu="handleOrgTreeContextmenuRange"
-					/>
-                    <!-- <el-input
+            <el-tree
+              ref="orgTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="orgAndManTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleOrgTreeExpand"
+              @node-collapse="handleOrgTreeCollapse"
+              @node-contextmenu="handleOrgTreeContextmenuRange"
+            />
+            <!-- <el-input
 						v-show="roleTreeSearchFlag"
 						v-model="roleTreeFilterText"
 						style="width:98%;margin: 3px;"
 						placeholder="搜索字段"
 						class="filter-tree"
 					/> -->
-					<el-tree
-                        ref="roleTreeRef"
-						style="max-width: 600px; border: 1px solid gainsboro; margin: 3px;"
-						:data="roleTree"
-						:props="treeDefaultProps"
-						:filter-node-method="filterNode"
-                        @node-expand="handleRoleTreeExpand"
-						@node-collapse="handleRoleTreeCollapse"
-						
-						@node-contextmenu="handleRoleTreeContextmenuRange"
-					/>
-				</el-aside>
-				<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
-					<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">仅可选择符合以下条件的数据</div>
-					<div  id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px;">
-                        <AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
-                        <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
+            <el-tree
+              ref="roleTreeRef"
+              style="max-width: 600px; border: 1px solid gainsboro; margin: 3px"
+              :data="roleTree"
+              :props="treeDefaultProps"
+              :filter-node-method="filterNode"
+              @node-expand="handleRoleTreeExpand"
+              @node-collapse="handleRoleTreeCollapse"
+              @node-contextmenu="handleRoleTreeContextmenuRange"
+            />
+          </el-aside>
+          <el-main
+            style="border: 1px solid gainsboro; padding: 3px"
+            class="associatedFormsHideDialogMain"
+          >
+            <div
+              style="
+                border: 1px solid gainsboro;
+                height: 7%;
+                border-bottom: 0px;
+                padding-top: 3px;
+                padding-left: 5px;
+                background-color: #e6f3fe;
+              "
+            >
+              仅可选择符合以下条件的数据
+            </div>
+            <div
+              id="associatedFormsHideEditArea"
+              style="border: 1px solid gainsboro; height: 38%; border-bottom: 0px"
+            >
+              <AssociatedFormsTinyaceRange
+                ref="aftRange"
+                :aft-text="controlData.control.dataRangeConditionHtml"
+                :aft-text-copy="controlData.control.dataRangeConditionHtmlCopy"
+                @text-change="aftTextChangedRange"
+                @gongshi-change="aftGongshiChangedRange"
+              ></AssociatedFormsTinyaceRange>
+              <!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
                             <span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
                         </div> -->
-                        
-                    </div>
-					<div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px;">
-                        <ul>
-                            <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
-                            <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
-                            <li>支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span>关键字,用于组织机构条件,角色条件,==运算符和!=运算符</li>
-                            <li>参考举例：</li>
-                            <span style="margin-left: 14px;">年龄>10</span><br>
-                            <span style="margin-left: 14px;">企管部==数据所属部门</span><br>
-                            <span style="margin-left: 14px;">绩效考核执行人包含数据拥有者</span><br>
-                            <span style="margin-left: 14px;">生产部包含数据所属部门</span>
-                        </ul>
-                    </div>
-				</el-main>
-				</el-container>
-			</div>
-		</template>
-		<template #footer>
-		<div class="dialog-footer">
-			<el-button @click="asfhTextCancelRange">取消</el-button>
-			<el-button type="primary" @click="handleDetermineRange">
-			确定
-			</el-button>
-		</div>
-    </template>
-	</el-dialog>
-
-
-
-
-
-
-    <!-- 数据填充规则弹窗 -->
-    <el-dialog v-model="associatedFormsFillRolesDialogFlag" title="数据填充规则" top="150px" :close-on-click-modal="false" :show-close="false" style="margin-top:70px ;min-height: 300px;max-height:900px"  width="60%"  >
-		<template v-if="controlData.type=='associatedForms'">
-            <el-button  style="font-size: large;margin-top: 10px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addFillRole">十 主表填充规则</el-button>
-            <div style="max-height:230px;border:1px solid white;overflow-y:auto;">
-                <div style="background-color: #F0F0F0;padding: 12px;border-radius: 5px;padding-left:45px;padding-bottom: 10px;margin-right: 10px;"><!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
-                    <template v-for="(item, index) in controlData.control.fillRoles.master"  :key="controlData.control.fillRoles.master[index].id">
-                        <AssociatedFormsFillRole 
-                            v-if="showAssociatedFormsFillRole"
-                            v-model:left-value="controlData.control.fillRoles.master[index].leftValue"  
-                            v-model:right-value="controlData.control.fillRoles.master[index].rightValue" 
-                            :left-tree-source = "asfasfMasterFieldTree" 
-                            :right-tree-source = "associatedFormsCurrentFormFieldTree1"  
-                            :current-key="controlData.control.fillRoles.master[index].id"  
-                            @del-role = "delRole"
-                            @child-role-right-changed = "childRoleRightChanged"  
-                            >
-                        </AssociatedFormsFillRole>
-                    </template>
-                </div>              
-            </div>
-            <el-popover
-                v-if="currentChildTableCount>0"
-				placement="right-start"
-				title=""
-				:width="200"
-				trigger="hover"
-				content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】"
-			>
-				<template #reference>
-					<el-button  style="font-size: large;margin-top: 23px;margin-bottom: 15px;"   type="primary" link append-to-body="true" modal="true" @click="addChildFillRole">十 子表填充规则</el-button>
-				</template>
-			</el-popover>
-            <div v-if="currentChildTableCount>0" style="max-height: 330px;overflow-y:auto;padding-top: 7px;">
-                <template v-for="(item, index) in controlData.control.fillRoles.child"  :key="controlData.control.fillRoles.child[index].id">
-                    <AssociatedFormsChildFillRole 
-                        v-model:selected-child-table="controlData.control.fillRoles.child[index].asfChildTableKey"  
-                        v-model:filter-condition="controlData.control.fillRoles.child[index].filterCondition"
-                        v-model:child-roles = "controlData.control.fillRoles.child[index].childRoles"
-                        :child-table-list="asfasfChildTableList"
-                        :asfasf-field-tree="asfasfFieldTree"
-                        :tree-default-props="treeDefaultProps"
-                        :filter-node="filterNode"
-                        
-                        :org-and-man-tree="orgAndManTree"
-                        :handle-org-tree-contextmenu-range = "handleOrgTreeContextmenuRange"
-                        :role-tree="roleTree"
-                        :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
-                        :associated-forms-current-form-field-tree= "associatedFormsCurrentFormFieldTree"  
-                        :asfasf-child-table-fields = "asfasfChildTableFields"
-                        :current-key="controlData.control.fillRoles.child[index].id" 
-                        :current-form-child-table-fields-for-fill-role = "currentFormChildTableFieldsForFillRole"
-                        @selected-or-del-child-role = "selectedOrDelChildRole"
-                        @child-role-right-changed = "childRoleRightChanged"
-                        @del-role = "delChildRole"
-                        >
-                    </AssociatedFormsChildFillRole>
-                </template>
             </div>
-		</template>
-		<template #footer>
-            <div class="dialog-footer">
-                <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
-                <el-button type="primary" @click="handleDetermineFillRoles">
-                确定
-                </el-button>
+            <div style="border: 1px solid gainsboro; height: 55%; padding-top: 20px">
+              <ul>
+                <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
+                <li>
+                  支持的符号：<span style="color: red"
+                    >'==', '>=', '>', '<=', '<', '!='</span
+                  >
+                </li>
+                <li>
+                  支持<span style="color: red">"包含,不包含,数据拥有者,数据所属部门"</span
+                  >关键字,用于组织机构条件,角色条件,==运算符和!=运算符
+                </li>
+                <li>参考举例：</li>
+                <span style="margin-left: 14px">年龄>10</span
+                ><br />
+                <span style="margin-left: 14px">企管部==数据所属部门</span
+                ><br />
+                <span style="margin-left: 14px">绩效考核执行人包含数据拥有者</span
+                ><br />
+                <span style="margin-left: 14px">生产部包含数据所属部门</span>
+              </ul>
             </div>
+          </el-main>
+        </el-container>
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="asfhTextCancelRange">取消</el-button>
+        <el-button type="primary" @click="handleDetermineRange"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 数据填充规则弹窗 -->
+  <el-dialog
+    v-model="associatedFormsFillRolesDialogFlag"
+    title="数据填充规则"
+    top="150px"
+    :close-on-click-modal="false"
+    :show-close="false"
+    style="margin-top: 70px; min-height: 300px; max-height: 900px"
+    width="60%"
+  >
+    <template v-if="controlData.type == 'associatedForms'">
+      <el-button
+        style="font-size: large; margin-top: 10px; margin-bottom: 15px"
+        type="primary"
+        link
+        append-to-body="true"
+        modal="true"
+        @click="addFillRole"
+        >十 主表填充规则</el-button
+      >
+      <div style="max-height: 230px; border: 1px solid white; overflow-y: auto">
+        <div
+          style="
+            background-color: #f0f0f0;
+            padding: 12px;
+            border-radius: 5px;
+            padding-left: 45px;
+            padding-bottom: 10px;
+            margin-right: 10px;
+          "
+        >
+          <!-- #F5F7FA     #E6F3FE  #F0F0F0  #F5F7FA-->
+          <template
+            v-for="(item, index) in controlData.control.fillRoles.master"
+            :key="controlData.control.fillRoles.master[index].id"
+          >
+            <AssociatedFormsFillRole
+              v-if="showAssociatedFormsFillRole"
+              v-model:left-value="controlData.control.fillRoles.master[index].leftValue"
+              v-model:right-value="controlData.control.fillRoles.master[index].rightValue"
+              :left-tree-source="asfasfMasterFieldTree"
+              :right-tree-source="associatedFormsCurrentFormFieldTree1"
+              :current-key="controlData.control.fillRoles.master[index].id"
+              @del-role="delRole"
+              @child-role-right-changed="childRoleRightChanged"
+            >
+            </AssociatedFormsFillRole>
+          </template>
+        </div>
+      </div>
+      <el-popover
+        v-if="currentChildTableCount > 0"
+        placement="right-start"
+        title=""
+        :width="200"
+        trigger="hover"
+        content="【关联表单子表字段】暂不支持填充至【当前表单主表字段】"
+      >
+        <template #reference>
+          <el-button
+            style="font-size: large; margin-top: 23px; margin-bottom: 15px"
+            type="primary"
+            link
+            append-to-body="true"
+            modal="true"
+            @click="addChildFillRole"
+            >十 子表填充规则</el-button
+          >
         </template>
-	</el-dialog>
-    
-    
-
-
-	<!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
-
-
-<!-- 关联选项设置弹窗 liwenxuan 20240426 start -->  <!-- :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" -->
-        <el-dialog  v-model="glxxszDialogFlag" class="glxxsztc" top="150px" :close-on-click-modal="false"    :title="`关联选项设置--`+controlData.name"  :show-close="false" style="margin-top:70px;" width="50%" >
-
-            
-            
-            <template v-if="(controlData.type=='radio'||controlData.type=='select')&&controlData.config.optionsType==0">
-                
-                <el-table  
-                :data="controlData.options" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                            :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}" 
-                            >
-                
-                    <el-table-column prop="link" label="当选项为" width="220">
-                        <template #default="optionScope">
-                            <span style="background-color: #E8EAEE;border-radius: 8px;padding-top: 5px;padding-bottom: 5px;padding-left: 15px;padding-right: 15px;">{{ optionScope.row.label }}</span>
-                            
-                        </template>
-                    </el-table-column>
-                    <el-table-column fixed="right" label="显示以下组件" >
-                            <template #default="fieldScope">
-                                
-                                <el-tree-select v-model="controlData.control.glxxsz[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                            </template>
-                    </el-table-column>
-                </el-table>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                
-                <el-button type="primary" @click="handleDetermineGlxxszDialog">
-                确定
-                </el-button>
-            </div>
+      </el-popover>
+      <div
+        v-if="currentChildTableCount > 0"
+        style="max-height: 330px; overflow-y: auto; padding-top: 7px"
+      >
+        <template
+          v-for="(item, index) in controlData.control.fillRoles.child"
+          :key="controlData.control.fillRoles.child[index].id"
+        >
+          <AssociatedFormsChildFillRole
+            v-model:selected-child-table="
+              controlData.control.fillRoles.child[index].asfChildTableKey
+            "
+            v-model:filter-condition="
+              controlData.control.fillRoles.child[index].filterCondition
+            "
+            v-model:child-roles="controlData.control.fillRoles.child[index].childRoles"
+            :child-table-list="asfasfChildTableList"
+            :asfasf-field-tree="asfasfFieldTree"
+            :tree-default-props="treeDefaultProps"
+            :filter-node="filterNode"
+            :org-and-man-tree="orgAndManTree"
+            :handle-org-tree-contextmenu-range="handleOrgTreeContextmenuRange"
+            :role-tree="roleTree"
+            :handle-role-tree-contextmenu-range="handleRoleTreeContextmenuRange"
+            :associated-forms-current-form-field-tree="
+              associatedFormsCurrentFormFieldTree
+            "
+            :asfasf-child-table-fields="asfasfChildTableFields"
+            :current-key="controlData.control.fillRoles.child[index].id"
+            :current-form-child-table-fields-for-fill-role="
+              currentFormChildTableFieldsForFillRole
+            "
+            @selected-or-del-child-role="selectedOrDelChildRole"
+            @child-role-right-changed="childRoleRightChanged"
+            @del-role="delChildRole"
+          >
+          </AssociatedFormsChildFillRole>
         </template>
-        </el-dialog>
-
-        <el-dialog v-model="glxxszDialogFlagCheckBox"  class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
-
-            
-            
-            <template v-if="controlData.type=='checkbox'">
-                
-                <el-table  
-                    :data="controlData.control.glxxszForCheckBox" stripe  border style="width: 100%;min-height:50px;max-height:500px;overflow-y:auto" 
-                    :cell-style="{height: '55px',paddingLeft: '15px'}" :header-cell-style="{background:'#F3F4F7',color:'#555',}">
-
-                    <el-table-column prop="link" label="当选项为" width="300">
-                        <template #default="optionScope">
-                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[optionScope.$index].selectedOptions" style="width: 100%" :data="controlData.options" multiple />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column fixed="right" label="显示以下组件" >
-                        <template #default="fieldScope">
-                            <el-tree-select v-model="controlData.control.glxxszForCheckBox[fieldScope.$index].showFields" style="width: 100%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                        </template>
-                    </el-table-column>
-
-                    <el-table-column fixed="right" label="操作" width="130">
-                        
-                        
-                        
-                        <template #default="operateScope">
-                            
-                            <el-button  type="danger" :icon="Delete" circle @click="deleteRowForGlxxsz(operateScope.row)"/>
-                        </template>
-                        
-                    </el-table-column>
-
-                </el-table>
-                <el-button plain type="success" style="margin-top: 10px;" @click="createRowForGlxxsz">新增</el-button>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                
-                <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
-                确定
-                </el-button>
-            </div>
-            </template>
-            </el-dialog>
-
-
-
-
-
-            <el-dialog  v-model="glxxszDialogFlagSwitch" class="glxxsztc" top="150px" :close-on-click-modal="false" :title="`关联选项设置--`+controlData.name" :show-close="false" style="margin-top:70px;" width="50%" >
-
-                        
-                        
-                <template v-if="controlData.type=='switch'">
-                    <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关打开时显示</span>
-                        <el-tree-select v-model="controlData.control.glxxszSwitch[0].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                    </div>
-                    <div style="display:flex"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">当开关关闭时显示</span>
-                        <el-tree-select v-model="controlData.control.glxxszSwitch[1].showFields" style="width: 60%" :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children" multiple   />
-                    </div>
-                    
-                </template>
-                <template #footer>
-                <div class="dialog-footer">
-                    
-                    <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
-                    确定
-                    </el-button>
-                </div>
-                </template> 
-            </el-dialog>
-
-
-        <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
-
-        <!-- 单选下拉多选选项来源value3--系统表单字段 start-->
-
-        <el-dialog  v-model="optionsValue3SettingDialogOpenFlag" class="glxxsztc" top="150px" :close-on-click-modal="false" title="选择表单字段" :show-close="false" style="margin-top:70px;" width="50%" >
-            <template v-if="controlData.type=='radio'||controlData.type=='select'||controlData.type=='checkbox'">
-                <div style="display:flex;margin-bottom: 20px;margin-top:20px"><span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择表单</span>
-                    <el-tree-select
-                        v-model="controlData.control.optionsValue3Formid"
-                        style="width: 390px;"
-                        :data="customerFormTree[0].children"
-                        check-strictly
-                        :render-after-expand="false"
-                        filterable
-                        @change="formidChangedOptionsValue3"
-                    />
-                </div>
-                <div style="display:flex" v-if="typeof(controlData.control.optionsValue3Formid)!='undefined' && typeof(asfasfFieldTreeOptionsValue3)!='undefined' && controlData.control.optionsValue3Formid!=''">
-				
-				<span style="font-size: larger;margin-left: 35px;margin-right: 15px;">请选择字段</span>
-                    <!--
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <!-- <el-button @click="asfhTextCancelFillRoles">取消</el-button> -->
+        <el-button type="primary" @click="handleDetermineFillRoles"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 关联表单设置弹窗 liwenxuan 20240402 end -->
+
+  <!-- 关联选项设置弹窗 liwenxuan 20240426 start -->
+  <!-- :title="`关联选项设置--`+controlData.item.label+`--`+controlData.name" -->
+  <el-dialog
+    v-model="glxxszDialogFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template
+      v-if="
+        (controlData.type == 'radio' || controlData.type == 'select') &&
+        controlData.config.optionsType == 0
+      "
+    >
+      <el-table
+        :data="controlData.options"
+        stripe
+        border
+        style="width: 100%; min-height: 50px; max-height: 500px; overflow-y: auto"
+        :cell-style="{ height: '55px', paddingLeft: '15px' }"
+        :header-cell-style="{ background: '#F3F4F7', color: '#555' }"
+      >
+        <el-table-column prop="link" label="当选项为" width="220">
+          <template #default="optionScope">
+            <span
+              style="
+                background-color: #e8eaee;
+                border-radius: 8px;
+                padding-top: 5px;
+                padding-bottom: 5px;
+                padding-left: 15px;
+                padding-right: 15px;
+              "
+              >{{ optionScope.row.label }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" label="显示以下组件">
+          <template #default="fieldScope">
+            <el-tree-select
+              v-model="controlData.control.glxxsz[fieldScope.$index].showFields"
+              style="width: 100%"
+              :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+              multiple
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialog"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="glxxszDialogFlagCheckBox"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'checkbox'">
+      <el-table
+        :data="controlData.control.glxxszForCheckBox"
+        stripe
+        border
+        style="width: 100%; min-height: 50px; max-height: 500px; overflow-y: auto"
+        :cell-style="{ height: '55px', paddingLeft: '15px' }"
+        :header-cell-style="{ background: '#F3F4F7', color: '#555' }"
+      >
+        <el-table-column prop="link" label="当选项为" width="300">
+          <template #default="optionScope">
+            <el-tree-select
+              v-model="
+                controlData.control.glxxszForCheckBox[optionScope.$index].selectedOptions
+              "
+              style="width: 100%"
+              :data="controlData.options"
+              multiple
+            />
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="显示以下组件">
+          <template #default="fieldScope">
+            <el-tree-select
+              v-model="
+                controlData.control.glxxszForCheckBox[fieldScope.$index].showFields
+              "
+              style="width: 100%"
+              :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+              multiple
+            />
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="130">
+          <template #default="operateScope">
+            <el-button
+              type="danger"
+              :icon="Delete"
+              circle
+              @click="deleteRowForGlxxsz(operateScope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-button plain type="success" style="margin-top: 10px" @click="createRowForGlxxsz"
+        >新增</el-button
+      >
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialogCheckBox">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <el-dialog
+    v-model="glxxszDialogFlagSwitch"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    :title="`关联选项设置--` + controlData.name"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template v-if="controlData.type == 'switch'">
+      <div style="display: flex; margin-bottom: 20px; margin-top: 20px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >当开关打开时显示</span
+        >
+        <el-tree-select
+          v-model="controlData.control.glxxszSwitch[0].showFields"
+          style="width: 60%"
+          :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+          multiple
+        />
+      </div>
+      <div style="display: flex">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >当开关关闭时显示</span
+        >
+        <el-tree-select
+          v-model="controlData.control.glxxszSwitch[1].showFields"
+          style="width: 60%"
+          :data="associatedFormsCurrentFormFieldTreeForGlxxszExceptSelf[0].children"
+          multiple
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineGlxxszDialogSwitch">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+
+  <!-- 关联选项设置弹窗 liwenxuan 20240426 end -->
+
+  <!-- 单选下拉多选选项来源value3--系统表单字段 start-->
+
+  <el-dialog
+    v-model="optionsValue3SettingDialogOpenFlag"
+    class="glxxsztc"
+    top="150px"
+    :close-on-click-modal="false"
+    title="选择表单字段"
+    :show-close="false"
+    style="margin-top: 70px"
+    width="50%"
+  >
+    <template
+      v-if="
+        controlData.type == 'radio' ||
+        controlData.type == 'select' ||
+        controlData.type == 'checkbox'
+      "
+    >
+      <div style="display: flex; margin-bottom: 20px; margin-top: 20px">
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择表单</span
+        >
+        <el-tree-select
+          v-model="controlData.control.optionsValue3Formid"
+          style="width: 390px"
+          :data="customerFormTree[0].children"
+          check-strictly
+          :render-after-expand="false"
+          filterable
+          @change="formidChangedOptionsValue3"
+        />
+      </div>
+      <div
+        style="display: flex"
+        v-if="
+          typeof controlData.control.optionsValue3Formid != 'undefined' &&
+          typeof asfasfFieldTreeOptionsValue3 != 'undefined' &&
+          controlData.control.optionsValue3Formid != ''
+        "
+      >
+        <span style="font-size: larger; margin-left: 35px; margin-right: 15px"
+          >请选择字段</span
+        >
+        <!--
                         
                         
                     -->
-                    <el-tree-select v-model="controlData.control.optionsValue3Field" style="width: 390px;" :data="asfasfFieldTreeOptionsValue3[0].children"    />
-                </div>
-            </template>
-            <template #footer>
-            <div class="dialog-footer">
-                <el-button type="primary" @click="handleDetermineoptionsValue3">
-                确定
-                </el-button>
-            </div>
-            </template> 
-        </el-dialog>
+        <el-tree-select
+          v-model="controlData.control.optionsValue3Field"
+          style="width: 390px"
+          :data="asfasfFieldTreeOptionsValue3[0].children"
+        />
+      </div>
+    </template>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button type="primary" @click="handleDetermineoptionsValue3"> 确定 </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
-<style  lang='scss' scoped>
+<style lang="scss" scoped>
 li::before {
-        content: "";
-        display: inline-block;
-        width: 4px;
-        height: 4px;
-        border-radius: 50%;
-        background-color: gray;
-        margin-right: 5px;
-        margin-left: 5px;
-        margin-bottom: 3.5px;
-    }
+  content: "";
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  border-radius: 50%;
+  background-color: gray;
+  margin-right: 5px;
+  margin-left: 5px;
+  margin-bottom: 3.5px;
+}
 
-	.sidebar-tools .el-tabs__content{
-        padding: 0;
-		
-    }
-	.el-collapse-item__header {
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
-    .el-collapse-item__header{
-        padding-left: 10px;
-        background-color: rgb(229, 229, 229);
-    }
+.sidebar-tools .el-tabs__content {
+  padding: 0;
+}
+.el-collapse-item__header {
+  padding-left: 10px;
+  background-color: rgb(229, 229, 229);
+}
+.el-collapse-item__header {
+  padding-left: 10px;
+  background-color: rgb(229, 229, 229);
+}
 
-    .form_cont{
-        padding: 0 10px;
-		.radioInput{
-			margin-bottom: 10px;
-		}
-    }
-	.avatar-uploader{
-		width: 100px;
-		height: 100px;
-		.avatar{
-			width: 100px;
-			height: 100px;
-		}
-		.avatar-uploader-icon{
-			width: 100px;
-			height: 100px;
-		}
+.form_cont {
+  padding: 0 10px;
+  .radioInput {
+    margin-bottom: 10px;
+  }
+}
+.avatar-uploader {
+  width: 100px;
+  height: 100px;
+  .avatar {
+    width: 100px;
+    height: 100px;
+  }
+  .avatar-uploader-icon {
+    width: 100px;
+    height: 100px;
+  }
 }
 .custom-tree-node {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: 14px;
-	padding-right: 8px;
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
 }
-.custom-tree-node:hover{
-	background-color:antiquewhite;
+.custom-tree-node:hover {
+  background-color: antiquewhite;
 }
 
-.associatedFormsHideDialogMain7{
-	display: flex;
-	
-	
+.associatedFormsHideDialogMain7 {
+  display: flex;
 }
-.el-main{
-	--el-main-padding: 5px
+.el-main {
+  --el-main-padding: 5px;
 }
-.jiaoYan{
-	.el-input-group__append, .el-input-group__prepend{
-		padding: 0 5px;
-	}
+.jiaoYan {
+  .el-input-group__append,
+  .el-input-group__prepend {
+    padding: 0 5px;
+  }
 }
 </style>
diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index ccae241..1adcb3b 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -3,264 +3,268 @@
 @ 时间: 2023-07-14 08:51:25
 @ 备注: 表单子表
 -->
-<script lang='ts' setup>
-import FormItem from './formItem.vue'
-import { inject, computed } from 'vue'
-import Tooltips from '@/components/DesignForm/tooltip.vue'
-import {constFormProps } from '@/api/DesignForm/utils'
-import { jsonParseStringify } from '@/utils/DesignForm'
-import LowcodeImagePage from '@/components/DesignForm/public/expand/lowcodeImage.vue'
-import AssociatedForms from '@/widget/associatedforms/index.vue'
-import UploadPageList from '@/components/DesignForm/public/expand/uploadPageList.vue'
-
-import LokOrgCentent from '@/widget/org/cont.vue' 
-import { SCOPE } from 'element-plus'
+<script lang="ts" setup>
+import FormItem from "./formItem.vue";
+import { inject, computed } from "vue";
+import Tooltips from "@/components/DesignForm/tooltip.vue";
+import { constFormProps } from "@/api/DesignForm/utils";
+import { jsonParseStringify } from "@/utils/DesignForm";
+import LowcodeImagePage from "@/components/DesignForm/public/expand/lowcodeImage.vue";
+import AssociatedForms from "@/widget/associatedforms/index.vue";
+import UploadPageList from "@/components/DesignForm/public/expand/uploadPageList.vue";
 
+import LokOrgCentent from "@/widget/org/cont.vue";
+import { SCOPE } from "element-plus";
 
 const props = withDefaults(
-    defineProps<{
-      	data: any
-    }>(),
-    {
-		data: () => {
-			return {}
-		}
-    }
-)
-const formProps = inject(constFormProps, {}) as any
+  defineProps<{
+    data: any;
+  }>(),
+  {
+    data: () => {
+      return {};
+    },
+  }
+);
+const formProps = inject(constFormProps, {}) as any;
 const tableDataNew = computed(() => {
-	// console.log("如果编辑页禁用时-----1---->",props.data.name)
-	// console.log("如果编辑页禁用时-----2---->",formProps.value.model[props.data.name])
-	// console.log("如果编辑页禁用时-----3---->",formProps.value.model)
-	// console.log("如果编辑页禁用时-----4---->",formProps.value)
-    return formProps.value.model[props.data.name]
-})
+  // console.log("如果编辑页禁用时-----1---->",props.data.name)
+  // console.log("如果编辑页禁用时-----2---->",formProps.value.model[props.data.name])
+  // console.log("如果编辑页禁用时-----3---->",formProps.value.model)
+  // console.log("如果编辑页禁用时-----4---->",formProps.value)
+  return formProps.value.model[props.data.name];
+});
 const type = computed(() => {
-    return formProps.value.type
-})
+  return formProps.value.type;
+});
 // 如果编辑页禁用时，则返回true
 const editDisabled = computed(() => {
-    return formProps.value.type === 2 && props.data.config?.editDisabled
-})
+  return formProps.value.type === 2 && props.data.config?.editDisabled;
+});
 const addColumn = () => {
-	// console.log("如果编辑页禁用时--------->",tableDataNew.value)
-    const temp: any = {}
-    if (props.data.list) {
-		props.data.list.forEach((item: any) => {
-			if (item.name) {
-				temp[item.name] = item.control.modelValue
-			}
-		})
-		tableDataNew.value.push(jsonParseStringify(temp))
-    }
-}
-const getText = (text: any,val:any,name:any) => {
-	console.log("text===>",text)
-	console.log("name===>",name)
-	console.log("val===>",val)
-    if (typeof text === 'string') {
-      	return text
-    } else {
-      	return text && text.toString()
-    }
-}
+  // console.log("如果编辑页禁用时--------->",tableDataNew.value)
+  const temp: any = {};
+  if (props.data.list) {
+    props.data.list.forEach((item: any) => {
+      if (item.name) {
+        temp[item.name] = item.control.modelValue;
+      }
+    });
+    tableDataNew.value.push(jsonParseStringify(temp));
+  }
+};
+const getText = (text: any, val: any, name: any) => {
+  console.log("text===>", text);
+  console.log("name===>", name);
+  console.log("val===>", val);
+  if (typeof text === "string") {
+    return text;
+  } else {
+    return text && text.toString();
+  }
+};
 const delColumn = (index: number) => {
-    tableDataNew.value.splice(index, 1)
-}
+  tableDataNew.value.splice(index, 1);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:22:14
 @ 功能: 时间戳转换对象
 */
-const timeToAry = (timestamp:number) => {
-	const date = new Date(timestamp);
-	const year = date.getFullYear();
-	const month = ('0' + (date.getMonth() + 1)).slice(-2);
-	const day = ('0' + date.getDate()).slice(-2);
-	const hours = ('0' + date.getHours()).slice(-2);
-	const minutes = ('0' + date.getMinutes()).slice(-2);
-	const seconds = ('0' + date.getSeconds()).slice(-2);
-	return {
-		year:year,
-		month:month,
-		day:day,
-		hours:hours,
-		minutes:minutes,
-		seconds
-	}
-}
+const timeToAry = (timestamp: number) => {
+  const date = new Date(timestamp);
+  const year = date.getFullYear();
+  const month = ("0" + (date.getMonth() + 1)).slice(-2);
+  const day = ("0" + date.getDate()).slice(-2);
+  const hours = ("0" + date.getHours()).slice(-2);
+  const minutes = ("0" + date.getMinutes()).slice(-2);
+  const seconds = ("0" + date.getSeconds()).slice(-2);
+  return {
+    year: year,
+    month: month,
+    day: day,
+    hours: hours,
+    minutes: minutes,
+    seconds,
+  };
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-02 13:02:49
 @ 功能: 将时间戳转换成字符串
 */
-const timeToString = (timeVal:any,types:int) => {
-	let timeStr = ""
-	if(Array.isArray(timeVal)){
-		if(timeVal.length >= 2){
-			let startTime = timeToAry(timeVal[0])
-			let endTime = timeToAry(timeVal[1])
-			switch(types){
-			case "year":	//年
-				timeStr = `${startTime.year} 至 ${endTime.year}`;
-				break;
-			case "month":	//月
-				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
-				break;
-			case "datetime": //日期+时间
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case  "week":	//周
-				let startWeek = getYearWeek(startTime)
-				let endWeek = getYearWeek(endTime)
-				timeStr = `${startWeek} 至 ${endWeek}`;
-				break;
-			case "timeCalss": //时间
-				timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case "datetimerange":
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
-				break;
-			case "daterange":
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
-				break;
-			case "monthrange":
-				timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
-				break;
-			default:
-				timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
-				break;
-			}
-		}else if(timeVal.length == 1){
-			let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal[0])
-			switch(types){
-				case "year":	//年
-					timeStr = `${year}`;
-					break;
-				case "month":	//月
-					timeStr = `${year}-${month}`;
-					break;
-				case "datetime": //日期+时间
-					timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-					break;
-				case  "week":	//周
-					timeStr = getYearWeek(timeVal)
-					break;
-				case "timeCalss": //时间
-					timeStr = `${hours}:${minutes}:${seconds}`;
-					break;
-				default:
-					timeStr = `${year}-${month}-${day}`
-					break;
-			}
-		}else{
-			timeStr = "未知时间"
-		}
-	}else{
-		let {year,month,day,hours,minutes,seconds} = timeToAry(timeVal)
-		switch(types){
-			case "year":	//年
-				timeStr = `${year}`;
-				break;
-			case "month":	//月
-				timeStr = `${year}-${month}`;
-				break;
-			case "datetime": //日期+时间
-				timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-				break;
-			case  "week":	//周
-				timeStr = getYearWeek(timeVal)
-				break;
-			case "timeCalss": //时间
-				timeStr = `${hours}:${minutes}:${seconds}`;
-				break;
-			default:
-				timeStr = `${year}-${month}-${day}`
-				break;
-		}
-	}
-	
-	return timeStr
-}
-let associatedFormsIndexTablekey = 0
+const timeToString = (timeVal: any, types: int) => {
+  let timeStr = "";
+  if (Array.isArray(timeVal)) {
+    if (timeVal.length >= 2) {
+      let startTime = timeToAry(timeVal[0]);
+      let endTime = timeToAry(timeVal[1]);
+      switch (types) {
+        case "year": //年
+          timeStr = `${startTime.year} 至 ${endTime.year}`;
+          break;
+        case "month": //月
+          timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+          break;
+        case "datetime": //日期+时间
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "week": //周
+          let startWeek = getYearWeek(startTime);
+          let endWeek = getYearWeek(endTime);
+          timeStr = `${startWeek} 至 ${endWeek}`;
+          break;
+        case "timeCalss": //时间
+          timeStr = `${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "datetimerange":
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} ${startTime.hours}:${startTime.minutes}:${startTime.seconds} 至 ${endTime.year}-${endTime.month}-${endTime.day} ${endTime.hours}:${endTime.minutes}:${endTime.seconds}`;
+          break;
+        case "daterange":
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+          break;
+        case "monthrange":
+          timeStr = `${startTime.year}-${startTime.month} 至 ${endTime.year}-${endTime.month}`;
+          break;
+        default:
+          timeStr = `${startTime.year}-${startTime.month}-${startTime.day} 至 ${endTime.year}-${endTime.month}-${endTime.day}`;
+          break;
+      }
+    } else if (timeVal.length == 1) {
+      let { year, month, day, hours, minutes, seconds } = timeToAry(timeVal[0]);
+      switch (types) {
+        case "year": //年
+          timeStr = `${year}`;
+          break;
+        case "month": //月
+          timeStr = `${year}-${month}`;
+          break;
+        case "datetime": //日期+时间
+          timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+          break;
+        case "week": //周
+          timeStr = getYearWeek(timeVal);
+          break;
+        case "timeCalss": //时间
+          timeStr = `${hours}:${minutes}:${seconds}`;
+          break;
+        default:
+          timeStr = `${year}-${month}-${day}`;
+          break;
+      }
+    } else {
+      timeStr = "未知时间";
+    }
+  } else {
+    let { year, month, day, hours, minutes, seconds } = timeToAry(timeVal);
+    switch (types) {
+      case "year": //年
+        timeStr = `${year}`;
+        break;
+      case "month": //月
+        timeStr = `${year}-${month}`;
+        break;
+      case "datetime": //日期+时间
+        timeStr = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        break;
+      case "week": //周
+        timeStr = getYearWeek(timeVal);
+        break;
+      case "timeCalss": //时间
+        timeStr = `${hours}:${minutes}:${seconds}`;
+        break;
+      default:
+        timeStr = `${year}-${month}-${day}`;
+        break;
+    }
+  }
+
+  return timeStr;
+};
+let associatedFormsIndexTablekey = 0;
 const emits = defineEmits<{
-	(e: 'asfValueChanged', val: any): void
-}>()
+  (e: "asfValueChanged", val: any): void;
+}>();
 
-function asfValueChanged(val:any){
-	//console.log("childTable-asfValueChanged",val)
-	emits("asfValueChanged",val)
+function asfValueChanged(val: any) {
+  //console.log("childTable-asfValueChanged",val)
+  emits("asfValueChanged", val);
 }
 </script>
 <template>
-	
-	<div class="form-table form-table-add">
-		<el-table
-			v-bind="data.control"
-			:class="[data.className]"
-			:data="tableDataNew"
-		>
-			<el-table-column
-				v-for="(item, index) in data.list"
-				:key="index"
-				:prop="item.name"
-				:label="item.item.label"
-				:width="item.item.span"
-			>
-				<template #default="scope">
-					
-					<span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
-					<div v-if="type === 4 || editDisabled">
-						<LokOrgCentent  v-if="item.type == 'orgCentent'" :orgid="scope.row[item.name].toString()" />
-						<div v-else-if="item.type=='lowcodeImage'">
-							<LowcodeImagePage :data="item" 
-								v-model="scope.row[item.name]" />
-						</div>
-						<div v-else-if="item.type=='upload'" >
-							<UploadPageList   :data="item" :img-list="scope.row[item.name]" :control="item.control" />
-						</div>
-						<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
-						</div>
-						<div v-else-if="item.type=='associatedForms'">
-							<AssociatedForms :data="item" 
-								v-model="scope.row[item.name]" :tablekey="associatedFormsIndexTablekey" :row-index="scope.$index"/>
-						</div>
-						<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
-					</div>
-					<div v-else>
-				
-						<form-item
-						v-model="scope.row[item.name]"
-						:tProp="`${data.name}.${scope.$index}.${item.name}`"
-						:row-index="scope.$index"
-						:data="item"
-						@asf-value-changed="asfValueChanged"
-						/>
-					</div>
-				</template>
-				<template #header="scope" v-if="item.help">
-					{{ scope.column.label }}
-					<Tooltip :content="item.help" />
-				</template>
-			</el-table-column>
-			<el-table-column
-				prop="del"
-				label="操作"
-				v-if="[1, 2].includes(type as number) && data.config.delBtnText && !editDisabled"
-			>
-				<template #default="scope">
-					<el-button link type="primary" @click="delColumn(scope.$index)">{{ data.config.delBtnText }}</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div
-			class="table-btn"
-			v-if="[1, 2].includes(type as number) && data.config.addBtnText && !editDisabled"
-		>
-			<el-button size="small" @click="addColumn">{{ data.config.addBtnText }}</el-button>
-		</div>
-	</div>
+  <div class="form-table form-table-add">
+    <el-table v-bind="data.control" :class="[data.className]" :data="tableDataNew">
+      <el-table-column
+        v-for="(item, index) in data.list"
+        :key="index"
+        :prop="item.name"
+        :label="item.item.label"
+        :width="item.item.span"
+      >
+        <template #default="scope">
+          <span v-if="item.type === 'index'">{{ scope.$index + 1 }}</span>
+          <div v-if="type === 4 || editDisabled">
+            <LokOrgCentent
+              v-if="item.type == 'orgCentent'"
+              :orgid="scope.row[item.name].toString()"
+            />
+            <div v-else-if="item.type == 'lowcodeImage'">
+              <LowcodeImagePage :data="item" v-model="scope.row[item.name]" />
+            </div>
+            <div v-else-if="item.type == 'upload'">
+              <UploadPageList
+                :data="item"
+                :img-list="scope.row[item.name]"
+                :control="item.control"
+              />
+            </div>
+            <div
+              v-else-if="item.type == 'datePicker'"
+              v-html="timeToString(scope.row[item.name], item.control.type)"
+            ></div>
+            <div v-else-if="item.type == 'associatedForms'">
+              <AssociatedForms
+                :data="item"
+                v-model="scope.row[item.name]"
+                :tablekey="associatedFormsIndexTablekey"
+                :row-index="scope.$index"
+              />
+            </div>
+            <div v-else>{{ getText(scope.row[item.name], scope.row, item.name) }}</div>
+          </div>
+          <div v-else>
+            <form-item
+              v-model="scope.row[item.name]"
+              :tProp="`${data.name}.${scope.$index}.${item.name}`"
+              :row-index="scope.$index"
+              :data="item"
+              @asf-value-changed="asfValueChanged"
+            />
+          </div>
+        </template>
+        <template #header="scope" v-if="item.help">
+          {{ scope.column.label }}
+          <Tooltip :content="item.help" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="del"
+        label="操作"
+        v-if="[1, 2].includes(type as number) && data.config.delBtnText && !editDisabled"
+      >
+        <template #default="scope">
+          <el-button link type="primary" @click="delColumn(scope.$index)">{{
+            data.config.delBtnText
+          }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      class="table-btn"
+      v-if="[1, 2].includes(type as number) && data.config.addBtnText && !editDisabled"
+    >
+      <el-button size="small" @click="addColumn">{{ data.config.addBtnText }}</el-button>
+    </div>
+  </div>
 </template>
-<style  lang='scss' scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 04337ed..8c940b3 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -3,528 +3,627 @@
 @ 时间: 2024-04-03 13:39:16
 @ 备注: 列表内容展示
 -->
-<script lang='ts' setup>
-import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { gainTaskFormInfo,generateFlow,gainEditDataLog,draftsInitiateApproval,afreshRunWorkflow } from '@/api/taskapi/management'
-import { Close } from '@element-plus/icons-vue'
-import { judgeSubmitCancel,startRunFlow } from '@/api/DesignForm/requestapi'
-import { submitButtonEs } from '@/api/DesignForm/tableButton'
+<script lang="ts" setup>
 import {
-  constFormBtnEvent,
-  constFormProps
-} from '@/api/DesignForm/utils'
-
-import RunFlowStep from '@/views/taskplatform/taskmanagement/runFlowStep.vue'
+  submitButton,
+  afreshSubmitButton,
+  editFormCont,
+  draftSubmitButton,
+  editLookFormCont,
+} from "@/utils/workflow/const";
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import {
+  gainTaskFormInfo,
+  generateFlow,
+  gainEditDataLog,
+  draftsInitiateApproval,
+  afreshRunWorkflow,
+} from "@/api/taskapi/management";
+import { Close } from "@element-plus/icons-vue";
+import { judgeSubmitCancel, startRunFlow } from "@/api/DesignForm/requestapi";
+import { submitButtonEs } from "@/api/DesignForm/tableButton";
+import { constFormBtnEvent, constFormProps } from "@/api/DesignForm/utils";
 
+import RunFlowStep from "@/views/taskplatform/taskmanagement/runFlowStep.vue";
 
 const props = defineProps({
-	isShow:{
-		type:Boolean,
-		default:false,
-	},
-	drawerWith:{
-		type:Number,
-		default:0
-	},
-	tablePageClass:{
-		type:Number,
-		default:1
-	},
-	operState:{
-		type:Number,
-		default:1
-	},
-	pageInfo:{
-		type:Object,
-		default(){
-			return {}
-		}
-	}
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
+  tablePageClass: {
+    type: Number,
+    default: 1,
+  },
+  operState: {
+    type: Number,
+    default: 1,
+  },
+  pageInfo: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
 });
 const formEl = ref<any>();
-const emits = defineEmits(["update:isShow","getPageData"]);
+const emits = defineEmits(["update:isShow", "getPageData"]);
 const formLoading = ref(false);
 const flowAry = ref<any[]>(); //流程列表
-const currentProgress  = ref<number>(1);  //当前步进值
-const runstep = ref(null)
+const currentProgress = ref<number>(1); //当前步进值
+const runstep = ref(null);
 //表单ID
-const openOfClose =  computed({
-	get() {
-		return props.isShow
-	},
-	set(val: boolean) {
-		emits('update:isShow', val)
-	}
+const openOfClose = computed({
+  get() {
+    return props.isShow;
+  },
+  set(val: boolean) {
+    emits("update:isShow", val);
+  },
 });
-const formProps = inject(constFormProps, {}) as any
+const formProps = inject(constFormProps, {}) as any;
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:09:24
 @ 功能: 监听状态变化处理数据
 */
-watch(()=>props.isShow,(val:bool)=>{
-	
-	if(val){
-		formLoading.value = true;
-		getCustomrrFormInfo();
-	}
-})
+watch(
+  () => props.isShow,
+  (val: bool) => {
+    if (val) {
+      formLoading.value = true;
+      getCustomrrFormInfo();
+    }
+  }
+);
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:25:15
 @ 功能: 关闭抽屉
 */
 const closeDrawer = () => {
-	emits('update:isShow', false)
-}
+  emits("update:isShow", false);
+};
 
 //表单相关内容
 const formState = reactive({
-    formData: {
-      list: [],
-      form: {},
-      config: {}
-    },
-    dict: {},
-    formId: props.pageInfo.id,
-    id: 1,
-    loading: true
-})
-const pageLog = ref<any[]>([])
+  formData: {
+    list: [],
+    form: {},
+    config: {},
+  },
+  dict: {},
+  formId: props.pageInfo.id,
+  id: 1,
+  loading: true,
+});
+const pageLog = ref<any[]>([]);
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 14:33:15
 @ 功能: 获取自定义表单内容
 */
 const getCustomrrFormInfo = () => {
-	gainTaskFormInfo({id:props.pageInfo.masters_key})
-		.then(({data})=>{
-			// console.log("获取自定义表单内容",data,data.structure)
-			formState.formData = stringToObj(data.structure.mastesform)
-			// console.log("获取自定义表单内容--->",formState)
-			formState.dict = string2json(data.structure.dict)
-			// formState.formData.list.push(editLookFormCont)
-			if(props.tablePageClass != 4){
-				judgeSubmitCancel({"name":data.structure.mastesformjson})
-					.then((data:any) =>{
-						if(data.code == 0){
-							if (data.data == 3 || data.data == 4){
-								// formState.formData.list.push(submitButtonEs)
-								if(props.operState == 2){
-										formState.formData.list.push(afreshSubmitButton)
-								}else if(props.operState == 3){
-										formState.formData.list.push(editFormCont)
-								}else if(props.operState == 4){
-										formState.formData.list.push(draftSubmitButton)
-								}else if(props.operState == 5){
-									formState.formData.list.push(submitButtonEs)
-								}
-							}
-						}
-					})
-			}
-			
+  gainTaskFormInfo({ id: props.pageInfo.masters_key })
+    .then(({ data }) => {
+      console.log("获取自定义表单内容", data, data.structure);
+      formState.formData = stringToObj(data.structure.mastesform);
+      // console.log("获取自定义表单内容--->",formState)
+      formState.dict = string2json(data.structure.dict);
+      // formState.formData.list.push(editLookFormCont)
+      if (props.tablePageClass != 4) {
+        judgeSubmitCancel({ name: data.structure.mastesformjson }).then((data: any) => {
+          if (data.code == 0) {
+            if (data.data == 3 || data.data == 4) {
+              // formState.formData.list.push(submitButtonEs)
+              if (props.operState == 2) {
+                formState.formData.list.push(afreshSubmitButton);
+              } else if (props.operState == 3) {
+                formState.formData.list.push(editFormCont);
+              } else if (props.operState == 4) {
+                formState.formData.list.push(draftSubmitButton);
+              } else if (props.operState == 5) {
+                formState.formData.list.push(submitButtonEs);
+              }
+            }
+          }
+        });
+      }
 
-			nextTick(()=>{
-				// console.log("获取自定义表单内容-1111-->",data.tableData)
-				formEl.value.setValue(data.tableData)
-			})
-		})
-		.finally(()=>{
-			formLoading.value = false;
-			//alert(props.pageInfo.masters_key)
-			gainEditDataLog({id:props.pageInfo.masters_key})
-			.then(({data})=>{
-				// console.log("获取修改记录-1111-->",data)
-				pageLog.value = data
-			});
-		})
-}
+      nextTick(() => {
+        // console.log("获取自定义表单内容-1111-->", formEl.value, data.tableData);
+        formEl.value.setValue(data.tableData);
+      });
+    })
+    .finally(() => {
+      formLoading.value = false;
+      //alert(props.pageInfo.masters_key)
+      gainEditDataLog({ id: props.pageInfo.masters_key }).then(({ data }) => {
+        // console.log("获取修改记录-1111-->",data)
+        pageLog.value = data;
+      });
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-07 10:55:34
 @ 功能: 表单动作回调
 */
 const afterSubmit = (type: string) => {
-	// console.log("表单提交成功")
-	if (type === 'success') {
-		// router.go(-1)
-		// console.log("表单提交成功")
-		emits("getPageData");
-		closeDrawer();
-		
-	}
-}
+  // console.log("表单提交成功")
+  if (type === "success") {
+    // router.go(-1)
+    // console.log("表单提交成功")
+    emits("getPageData");
+    closeDrawer();
+  }
+};
 const closeAppSubmit = () => {
-	closeDrawer()
-}
+  closeDrawer();
+};
 //流程执行
 const drawerBeforeClose = () => {
-	// console.log("监听打开关闭",false)
-	// emits("getmytodolist")
-	// emits("update:isshow", false);
-}
+  // console.log("监听打开关闭",false)
+  // emits("getmytodolist")
+  // emits("update:isshow", false);
+};
 //提交审批
-const sendDraftSubmit = (type: string,val?:any) => {
-	// console.log("提交审批",type,val)
-	// emits("getmytodolist")
-	if (type === 'success') {
-		if(props.pageInfo.flowIsOpen == 1){
-			let sendInfo ={
-				id:val.data.runFlowId,
-				flowList:flowAry.value,
-				state:3
-			}
-			// console.log("草稿提交审批--1-<",sendInfo)
-			draftsInitiateApproval(sendInfo)
-				.then((data:any) =>{
-					// console.log("草稿提交审批---<",sendInfo,data)
-					if(data.code == 0){
-						ElMessage.success(data.msg || '提交成功！')
-						if(runstep.value){
-							runstep.value.gainRunFlowTask()
-						}
-						emits("getPageData");
-						closeDrawer()
-					}
-				})
-		}
-	}
-}
+const sendDraftSubmit = (type: string, val?: any) => {
+  // console.log("提交审批",type,val)
+  // emits("getmytodolist")
+  if (type === "success") {
+    if (props.pageInfo.flowIsOpen == 1) {
+      let sendInfo = {
+        id: val.data.runFlowId,
+        flowList: flowAry.value,
+        state: 3,
+      };
+      // console.log("草稿提交审批--1-<",sendInfo)
+      draftsInitiateApproval(sendInfo).then((data: any) => {
+        // console.log("草稿提交审批---<",sendInfo,data)
+        if (data.code == 0) {
+          ElMessage.success(data.msg || "提交成功！");
+          if (runstep.value) {
+            runstep.value.gainRunFlowTask();
+          }
+          emits("getPageData");
+          closeDrawer();
+        }
+      });
+    }
+  }
+};
 //保存草稿箱(带流程)
-const saveEditFormInfo  = (type: string,val?:any) => {
-	// console.log("草稿提交审批--1-<",type,val)
-	if(type == "success"){
-		runstep.value.gainRunFlowTask()
-		emits("getPageData");
-		closeDrawer()
-	}
-}
+const saveEditFormInfo = (type: string, val?: any) => {
+  // console.log("草稿提交审批--1-<",type,val)
+  if (type == "success") {
+    runstep.value.gainRunFlowTask();
+    emits("getPageData");
+    closeDrawer();
+  }
+};
 
 //重新提交审核
-const anewSubmit = (type: string,val?:any) => {
-	// console.log("重新提交数据-11--<",type,val)
-	if(type == "success"){
-		afreshRunWorkflow({id:val.data.runFlowId})
-			.then((data:any) => {
-				// console.log("重新提交数据---<",data,runstep.value)
-				runstep.value.gainRunFlowTask()
-			})
-			.finally(() => {
-				emits("getPageData");
-				closeDrawer()
-			})
-	}
-}
+const anewSubmit = (type: string, val?: any) => {
+  // console.log("重新提交数据-11--<",type,val)
+  if (type == "success") {
+    afreshRunWorkflow({ id: val.data.runFlowId })
+      .then((data: any) => {
+        // console.log("重新提交数据---<",data,runstep.value)
+        runstep.value.gainRunFlowTask();
+      })
+      .finally(() => {
+        emits("getPageData");
+        closeDrawer();
+      });
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:35:24
 @ 功能: 申请修改
 */
 //修改完毕
-const submitEdit = (type: string,val?:any) => {
-	// console("修改完毕----->",type,val)
-	if(type == "success"){
-		runstep.value.gainRunFlowTask()
-		emits("getPageData");
-		closeDrawer()
-	}
-}
+const submitEdit = (type: string, val?: any) => {
+  // console("修改完毕----->",type,val)
+  if (type == "success") {
+    runstep.value.gainRunFlowTask();
+    emits("getPageData");
+    closeDrawer();
+  }
+};
 const jsuanKuandu = () => {
-	if(props.pageInfo.flowIsOpen==1){
-		return 900 + 350
-	}else{
-		return 900
-	}
-	
-}
+  if (props.pageInfo.flowIsOpen == 1) {
+    return 900 + 350;
+  } else {
+    return 900;
+  }
+};
 </script>
 <template>
-	<el-drawer
-		v-model="openOfClose"
-		title="查看表单内容"
-		:size="jsuanKuandu()"
-		:with-header="false" 
-		:close-on-click-modal="false" 
-		:close-on-press-escape="false" 
-		:destroy-on-close="true"
-	>
-		<div v-if="props.pageInfo.flowIsOpen==1" class="common-layout">
-		
-			<el-container>
-				<el-main>
-				
-					<ak-form
-						ref="formEl"
-						v-loading="formLoading" element-loading-text="Loading..."
-						:form-data="formState.formData"
-						:type="props.tablePageClass"
-						:dict="formState.dict"
-						request-url="getFormContent"
-						add-url="saveFormContent"
-						edit-url="editFormContent"
-						:before-submit="beforeSubmit"
-						:close-app-submit="closeDrawer"
-						:change-key-val="changeKeyVal"
-						:anew-submit = "anewSubmit"
-						:save-edit-form-info="saveEditFormInfo"
-						:send-draft-submit= "sendDraftSubmit"
-						:after-submit="afterSubmit"
-						:submit-edit="submitEdit"
-					/>
-					<el-divider  v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
-					<el-timeline style="width: 100%">
-						<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
-							<el-card>
-								<el-descriptions  border>
-									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastItem.label" :label="mastItem.label">
-										{{mastItem.label}}
-									</el-descriptions-item>
-								</el-descriptions>
-								<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
-									<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
-										<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
-											<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
-											</el-descriptions-item>
-										</el-descriptions>
-									</el-tab-pane>
-								</el-tabs>
-								<table style="margin-top:20px;">
-										<tr>
-											<td class="biankuang" width="100">修改说明：</td>
-											<td class="biankuang">{{item.explicate}}</td>
-										</tr>
-									</table>
-							</el-card>
-						</el-timeline-item>
-					</el-timeline>
-				</el-main>
-				<el-aside width="350px" class="flowBox">
-					<el-header height="30px">
-						<div class="workFlowHead">
-							<el-text>审批流程</el-text>
-							<el-icon @click="closeDrawer"><Close /></el-icon>
-						</div>
-					</el-header>
-					<el-scrollbar class="scorllbarBox">
-			
-						<RunFlowStep ref="runstep" v-model:flowary="flowAry" :flow-key="props.pageInfo.runFlowId" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
-					</el-scrollbar>
-				</el-aside>
-				
-			</el-container>
-		</div>
-		<div v-else class="common-layout">
-			<el-header height="30px">
-				<el-icon @click="closeDrawer"><Close /></el-icon>
-			</el-header>
-			<ak-form
-				ref="formEl"
-				v-loading="formLoading" element-loading-text="Loading..."
-				:form-data="formState.formData"
-				:type="props.tablePageClass"
-				:dict="formState.dict"
-				request-url="getFormContent"
-				add-url="saveFormContent"
-				edit-url="editFormContent"
-				:before-submit="beforeSubmit"
-				:close-app-submit="closeDrawer"
-				:change-key-val="changeKeyVal"
-				:anew-submit = "anewSubmit"
-				:after-submit="afterSubmit"
-				:save-edit-form-info="saveEditFormInfo"
-				:send-draft-submit= "sendDraftSubmit"
-				:submit-edit="submitEdit"
-			/>
-			<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史记录</el-divider>
-			<el-timeline style="width: 100%">
-				<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
-					<el-card >
-						<el-tabs>
-							<el-tab-pane label="主要信息">
-								<el-descriptions  border :column="1">
-									<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" label-align="right"  width="150px" >
-										<template #label>
-											<div style="width: 100px;">
-												{{mastItem.label}}
-											</div>
-										</template>
-										
-										
-										<div v-if="mastItem.types=='lowcodeImage'">
-											<el-image style="width: 100px; height: 100px" :src="mastItem.value" fit="cover" />
-										</div>
-										<div v-if="mastItem.types=='lowcodeCarsusel'">
-											<el-carousel :interval="5000" type="card" height="200px">
-												<el-carousel-item v-for="item in mastItem.value" :key="item.imgId">
-													<el-image style="width: 100%; height: 100%" :src="item.imgUrl" fit="fill" />
-												</el-carousel-item>
-											</el-carousel>
-										</div>
-										<div v-else-if="mastItem.types=='signaturemap'">
-											<el-image style="width: 200px; height: 150px" :src="mastItem.value" fit="cover" />
-										</div>
-										<div v-else-if="mastItem.types=='colorPicker'">
-											<div :style="'width: 30px; height: 30px; background-color: '+mastItem.value" ></div>
-										</div>
-										<div v-else-if="mastItem.types=='switch'">
-											<el-switch
-												v-model="mastItem.value"
-												class="ml-2"
-												:active-value="1"
-												:inactive-value="2"
-												disabled
-											/>
-										</div>
-										<div v-else-if="mastItem.types=='rate'">
-											<el-rate v-model="mastItem.value" disabled />
-										</div>
-										<div v-else-if="mastItem.types=='slider'" style="max-width: 300px;">
-											<el-slider v-model="mastItem.value" disabled />
-										</div>
-										<div v-else-if="mastItem.types=='videoUpAndPlay'">
-
-											<el-carousel :interval="5000" arrow="always" height="250px">
-												<el-carousel-item v-for="item in mastItem.value" :key="item.id">
-													<video  
-														:src="item.url"
-														style="width: 100%; height: 250px"
-														controls
-														>
-													</video>
-												</el-carousel-item>
-											</el-carousel>
-											
-											
-										</div>
-										<div v-else-if="mastItem.types=='upload'">
-											<div v-if="mastItem.auxiliary=='picture-card'">
-												<el-image style="width: 100px; height: 100px" :src="mastItem.value" fit="cover" />
-											</div>
-											<div v-else-if="mastItem.auxiliary=='picture'">
-												<el-image style="width: 100px; height: 100px" :src="mastItem.value" fit="cover" />
-											</div>
-											<div v-else v-html="mastItem.value"></div>
-										</div>
-										<div v-else-if="mastItem.types=='baidumap'">
-											<BaiduMapLook :address="mastItem.value" />
-										</div>
-										<div v-else v-html="mastItem.value"></div>
-									</el-descriptions-item>
-								</el-descriptions>
-							</el-tab-pane>
-						</el-tabs>
-						<el-tabs v-if="item.sunData" type="border-card" style="margin-top:20px;">
-							<el-tab-pane v-for="(sonItem,sonIndex) in item.sunData" :label="sonIndex" :key="sonIndex">
-							
-								<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
-									<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" width="150px" >	
-										<template #label>
-											<div style="width: 100px;">
-												{{sonCentor.label}}
-											</div>
-										</template>
-
-										<div v-if="sonCentor.types=='lowcodeImage'">
-											<el-image style="width: 100px; height: 100px" :src="sonCentor.value" fit="cover" />
-										</div>
-										<div v-if="sonCentor.types=='lowcodeCarsusel'">
-											<el-carousel :interval="5000" type="card" height="200px">
-												<el-carousel-item v-for="item in sonCentor.value" :key="item.imgId">
-													<el-image style="width: 100%; height: 100%" :src="item.imgUrl" fit="fill" />
-												</el-carousel-item>
-											</el-carousel>
-										</div>
-										<div v-else-if="sonCentor.types=='signaturemap'">
-											<el-image style="width: 200px; height: 150px" :src="sonCentor.value" fit="cover" />
-										</div>
-										<div v-else-if="sonCentor.types=='colorPicker'">
-											<div :style="'width: 30px; height: 30px; background-color: '+sonCentor.value" ></div>
-										</div>
-										<div v-else-if="sonCentor.types=='rate'">
-											<el-rate v-model="sonCentor.value" disabled />
-										</div>
-										<div v-else-if="sonCentor.types=='slider'" style="max-width: 300px;">
-											<el-slider v-model="sonCentor.value" disabled />
-										</div>
-										<div v-else-if="sonCentor.types=='videoUpAndPlay'">
-
-											<el-carousel :interval="5000" arrow="always" height="250px">
-												<el-carousel-item v-for="item in sonCentor.value" :key="item.id">
-													<video  
-														:src="item.url"
-														style="width: 100%; height: 250px"
-														controls
-														>
-													</video>
-												</el-carousel-item>
-											</el-carousel>
-											
-											
-										</div>
-										<div v-else-if="sonCentor.types=='upload'">
-											<div v-if="sonCentor.auxiliary=='picture-card'">
-												<el-image style="width: 100px; height: 100px" :src="sonCentor.value" fit="cover" />
-											</div>
-											<div v-else-if="sonCentor.auxiliary=='picture'">
-												<el-image style="width: 100px; height: 100px" :src="sonCentor.value" fit="cover" />
-											</div>
-											<div v-else v-html="sonCentor.value"></div>
-										</div>
-										<div v-else-if="sonCentor.types=='baidumap'">
-											<BaiduMapLook :address="sonCentor.value" />
-										</div>
-										<div v-else v-html="sonCentor.value"></div>
-
-
-
+  <el-drawer
+    v-model="openOfClose"
+    title="查看表单内容"
+    :size="jsuanKuandu()"
+    :with-header="false"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+  >
+    <div v-if="props.pageInfo.flowIsOpen == 1" class="common-layout">
+      <el-container>
+        <el-main>
+          <ak-form
+            ref="formEl"
+            v-loading="formLoading"
+            element-loading-text="Loading..."
+            :form-data="formState.formData"
+            :type="props.tablePageClass"
+            :dict="formState.dict"
+            request-url="getFormContent"
+            add-url="saveFormContent"
+            edit-url="editFormContent"
+            :before-submit="beforeSubmit"
+            :close-app-submit="closeDrawer"
+            :change-key-val="changeKeyVal"
+            :anew-submit="anewSubmit"
+            :save-edit-form-info="saveEditFormInfo"
+            :send-draft-submit="sendDraftSubmit"
+            :after-submit="afterSubmit"
+            :submit-edit="submitEdit"
+          />
+          <el-divider v-if="pageLog && pageLog.length > 0" content-position="left"
+            >历史记录</el-divider
+          >
+          <el-timeline style="width: 100%">
+            <el-timeline-item
+              v-for="(item, index) in pageLog"
+              :key="index"
+              :timestamp="item.time + ' 操作人：' + item.creater"
+              placement="top"
+            >
+              <el-card>
+                <el-descriptions border>
+                  <el-descriptions-item
+                    v-for="(mastItem, mastIndex) in item.masterdata"
+                    :key="mastItem.label"
+                    :label="mastItem.label"
+                  >
+                    {{ mastItem.label }}
+                  </el-descriptions-item>
+                </el-descriptions>
+                <el-tabs v-if="item.sunList" type="border-card" style="margin-top: 20px">
+                  <el-tab-pane
+                    v-for="(sonItem, sonIndex) in item.sunList"
+                    :label="sonIndex"
+                    :key="sonIndex"
+                  >
+                    <el-descriptions
+                      v-for="(sonVal, sonIndex) in sonItem"
+                      :key="sonIndex"
+                      border
+                    >
+                      <el-descriptions-item
+                        v-for="(sonCentor, sonKey) in sonVal"
+                        :key="sonKey"
+                        :label="sonKey"
+                      >
+                        {{ sonCentor }}
+                      </el-descriptions-item>
+                    </el-descriptions>
+                  </el-tab-pane>
+                </el-tabs>
+                <table style="margin-top: 20px">
+                  <tr>
+                    <td class="biankuang" width="100">修改说明：</td>
+                    <td class="biankuang">{{ item.explicate }}</td>
+                  </tr>
+                </table>
+              </el-card>
+            </el-timeline-item>
+          </el-timeline>
+        </el-main>
+        <el-aside width="350px" class="flowBox">
+          <el-header height="30px">
+            <div class="workFlowHead">
+              <el-text>审批流程</el-text>
+              <el-icon @click="closeDrawer"><Close /></el-icon>
+            </div>
+          </el-header>
+          <el-scrollbar class="scorllbarBox">
+            <RunFlowStep
+              ref="runstep"
+              v-model:flowary="flowAry"
+              :flow-key="props.pageInfo.runFlowId"
+              :current-progress="currentProgress"
+              @updatelist="drawerBeforeClose"
+            />
+          </el-scrollbar>
+        </el-aside>
+      </el-container>
+    </div>
+    <div v-else class="common-layout">
+      <el-header height="30px">
+        <el-icon @click="closeDrawer"><Close /></el-icon>
+      </el-header>
+      <ak-form
+        ref="formEl"
+        v-loading="formLoading"
+        element-loading-text="Loading..."
+        :form-data="formState.formData"
+        :type="props.tablePageClass"
+        :dict="formState.dict"
+        request-url="getFormContent"
+        add-url="saveFormContent"
+        edit-url="editFormContent"
+        :before-submit="beforeSubmit"
+        :close-app-submit="closeDrawer"
+        :change-key-val="changeKeyVal"
+        :anew-submit="anewSubmit"
+        :after-submit="afterSubmit"
+        :save-edit-form-info="saveEditFormInfo"
+        :send-draft-submit="sendDraftSubmit"
+        :submit-edit="submitEdit"
+      />
+      <el-divider v-if="pageLog && pageLog.length > 0" content-position="left"
+        >历史记录</el-divider
+      >
+      <el-timeline style="width: 100%">
+        <el-timeline-item
+          v-for="(item, index) in pageLog"
+          :key="index"
+          :timestamp="item.time + ' 操作人：' + item.creater"
+          placement="top"
+        >
+          <el-card>
+            <el-tabs>
+              <el-tab-pane label="主要信息">
+                <el-descriptions border :column="1">
+                  <el-descriptions-item
+                    v-for="(mastItem, mastIndex) in item.masterdata"
+                    :key="mastIndex"
+                    label-align="right"
+                    width="150px"
+                  >
+                    <template #label>
+                      <div style="width: 100px">
+                        {{ mastItem.label }}
+                      </div>
+                    </template>
 
+                    <div v-if="mastItem.types == 'lowcodeImage'">
+                      <el-image
+                        style="width: 100px; height: 100px"
+                        :src="mastItem.value"
+                        fit="cover"
+                      />
+                    </div>
+                    <div v-if="mastItem.types == 'lowcodeCarsusel'">
+                      <el-carousel :interval="5000" type="card" height="200px">
+                        <el-carousel-item
+                          v-for="item in mastItem.value"
+                          :key="item.imgId"
+                        >
+                          <el-image
+                            style="width: 100%; height: 100%"
+                            :src="item.imgUrl"
+                            fit="fill"
+                          />
+                        </el-carousel-item>
+                      </el-carousel>
+                    </div>
+                    <div v-else-if="mastItem.types == 'signaturemap'">
+                      <el-image
+                        style="width: 200px; height: 150px"
+                        :src="mastItem.value"
+                        fit="cover"
+                      />
+                    </div>
+                    <div v-else-if="mastItem.types == 'colorPicker'">
+                      <div
+                        :style="
+                          'width: 30px; height: 30px; background-color: ' + mastItem.value
+                        "
+                      ></div>
+                    </div>
+                    <div v-else-if="mastItem.types == 'switch'">
+                      <el-switch
+                        v-model="mastItem.value"
+                        class="ml-2"
+                        :active-value="1"
+                        :inactive-value="2"
+                        disabled
+                      />
+                    </div>
+                    <div v-else-if="mastItem.types == 'rate'">
+                      <el-rate v-model="mastItem.value" disabled />
+                    </div>
+                    <div v-else-if="mastItem.types == 'slider'" style="max-width: 300px">
+                      <el-slider v-model="mastItem.value" disabled />
+                    </div>
+                    <div v-else-if="mastItem.types == 'videoUpAndPlay'">
+                      <el-carousel :interval="5000" arrow="always" height="250px">
+                        <el-carousel-item v-for="item in mastItem.value" :key="item.id">
+                          <video
+                            :src="item.url"
+                            style="width: 100%; height: 250px"
+                            controls
+                          ></video>
+                        </el-carousel-item>
+                      </el-carousel>
+                    </div>
+                    <div v-else-if="mastItem.types == 'upload'">
+                      <div v-if="mastItem.auxiliary == 'picture-card'">
+                        <el-image
+                          style="width: 100px; height: 100px"
+                          :src="mastItem.value"
+                          fit="cover"
+                        />
+                      </div>
+                      <div v-else-if="mastItem.auxiliary == 'picture'">
+                        <el-image
+                          style="width: 100px; height: 100px"
+                          :src="mastItem.value"
+                          fit="cover"
+                        />
+                      </div>
+                      <div v-else v-html="mastItem.value"></div>
+                    </div>
+                    <div v-else-if="mastItem.types == 'baidumap'">
+                      <BaiduMapLook :address="mastItem.value" />
+                    </div>
+                    <div v-else v-html="mastItem.value"></div>
+                  </el-descriptions-item>
+                </el-descriptions>
+              </el-tab-pane>
+            </el-tabs>
+            <el-tabs v-if="item.sunData" type="border-card" style="margin-top: 20px">
+              <el-tab-pane
+                v-for="(sonItem, sonIndex) in item.sunData"
+                :label="sonIndex"
+                :key="sonIndex"
+              >
+                <el-descriptions
+                  v-for="(sonVal, sonIndex) in sonItem"
+                  :key="sonIndex"
+                  border
+                >
+                  <el-descriptions-item
+                    v-for="(sonCentor, sonKey) in sonVal"
+                    :key="sonKey"
+                    width="150px"
+                  >
+                    <template #label>
+                      <div style="width: 100px">
+                        {{ sonCentor.label }}
+                      </div>
+                    </template>
 
-									</el-descriptions-item>
-								</el-descriptions>
-							</el-tab-pane>
-						</el-tabs>
-					</el-card>
-				</el-timeline-item>
-			</el-timeline>
-		</div>
-	</el-drawer>
+                    <div v-if="sonCentor.types == 'lowcodeImage'">
+                      <el-image
+                        style="width: 100px; height: 100px"
+                        :src="sonCentor.value"
+                        fit="cover"
+                      />
+                    </div>
+                    <div v-if="sonCentor.types == 'lowcodeCarsusel'">
+                      <el-carousel :interval="5000" type="card" height="200px">
+                        <el-carousel-item
+                          v-for="item in sonCentor.value"
+                          :key="item.imgId"
+                        >
+                          <el-image
+                            style="width: 100%; height: 100%"
+                            :src="item.imgUrl"
+                            fit="fill"
+                          />
+                        </el-carousel-item>
+                      </el-carousel>
+                    </div>
+                    <div v-else-if="sonCentor.types == 'signaturemap'">
+                      <el-image
+                        style="width: 200px; height: 150px"
+                        :src="sonCentor.value"
+                        fit="cover"
+                      />
+                    </div>
+                    <div v-else-if="sonCentor.types == 'colorPicker'">
+                      <div
+                        :style="
+                          'width: 30px; height: 30px; background-color: ' +
+                          sonCentor.value
+                        "
+                      ></div>
+                    </div>
+                    <div v-else-if="sonCentor.types == 'rate'">
+                      <el-rate v-model="sonCentor.value" disabled />
+                    </div>
+                    <div v-else-if="sonCentor.types == 'slider'" style="max-width: 300px">
+                      <el-slider v-model="sonCentor.value" disabled />
+                    </div>
+                    <div v-else-if="sonCentor.types == 'videoUpAndPlay'">
+                      <el-carousel :interval="5000" arrow="always" height="250px">
+                        <el-carousel-item v-for="item in sonCentor.value" :key="item.id">
+                          <video
+                            :src="item.url"
+                            style="width: 100%; height: 250px"
+                            controls
+                          ></video>
+                        </el-carousel-item>
+                      </el-carousel>
+                    </div>
+                    <div v-else-if="sonCentor.types == 'upload'">
+                      <div v-if="sonCentor.auxiliary == 'picture-card'">
+                        <el-image
+                          style="width: 100px; height: 100px"
+                          :src="sonCentor.value"
+                          fit="cover"
+                        />
+                      </div>
+                      <div v-else-if="sonCentor.auxiliary == 'picture'">
+                        <el-image
+                          style="width: 100px; height: 100px"
+                          :src="sonCentor.value"
+                          fit="cover"
+                        />
+                      </div>
+                      <div v-else v-html="sonCentor.value"></div>
+                    </div>
+                    <div v-else-if="sonCentor.types == 'baidumap'">
+                      <BaiduMapLook :address="sonCentor.value" />
+                    </div>
+                    <div v-else v-html="sonCentor.value"></div>
+                  </el-descriptions-item>
+                </el-descriptions>
+              </el-tab-pane>
+            </el-tabs>
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </div>
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-.common-layout{
-	height: 100vh;
-	padding: 0 15px;
-	.el-main{
-		height: 100vh;
-		padding:0;
-	}
-	.flowBox{
-		height: 100vh;
-		border-left: 1px solid #ccc;
-		.scorllbarBox{
-			height: calc(100vh - 35px)
-		}
-		.workFlowHead{
-			display: flex;
-			align-items: center;
-  			justify-content: space-between;
-		}
-	}
-	.el-header{
-		padding:0 10px;
-		line-height:30px;
-		text-align:right;
-		font-size:20px;
-		i{
-			cursor:pointer;
-		}
-	}
-	
+<style lang="scss" scoped>
+.common-layout {
+  height: 100vh;
+  padding: 0 15px;
+  .el-main {
+    height: 100vh;
+    padding: 0;
+  }
+  .flowBox {
+    height: 100vh;
+    border-left: 1px solid #ccc;
+    .scorllbarBox {
+      height: calc(100vh - 35px);
+    }
+    .workFlowHead {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+  }
+  .el-header {
+    padding: 0 10px;
+    line-height: 30px;
+    text-align: right;
+    font-size: 20px;
+    i {
+      cursor: pointer;
+    }
+  }
 }
-.biankuang{
-	border: 1px solid #D4D7DE;
-	padding:10px 10px;
-	
+.biankuang {
+  border: 1px solid #d4d7de;
+  padding: 10px 10px;
 }
 </style>
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index da5c9dd..f1df33d 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -3,231 +3,242 @@
 @ 时间: 2024-03-29 14:21:27
 @ 备注: 自定义表单通用列表
 -->
-<script lang='ts' setup>
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
-import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
-import { useDesignFormStore } from '@/store/DesignForm/designForm'
-import { attrButton,FormPageList,FormPageConfig,viewPageType } from '@/api/DesignForm/tableButton'
-import { inputUnit,timeUnit,choiceUnit,switchUnit,orgUnit,checkboxUnit } from '@/api/DesignForm/fieldUnit'
-import type { FormInstance, FormRules,ElNotification  } from 'element-plus'
-import { gainFormPageListCont } from '@/api/DesignForm/requestapi'
-import { Picture,InfoFilled,QuestionFilled } from '@element-plus/icons-vue'
-import request from '@/utils/request';
-import { softDeletion,retractRunWorkFlow } from '@/api/taskapi/management'
+<script lang="ts" setup>
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
+import { onBeforeRouteLeave, useRoute, useRouter } from "vue-router";
+import { useDesignFormStore } from "@/store/DesignForm/designForm";
+import {
+  attrButton,
+  FormPageList,
+  FormPageConfig,
+  viewPageType,
+} from "@/api/DesignForm/tableButton";
+import {
+  inputUnit,
+  timeUnit,
+  choiceUnit,
+  switchUnit,
+  orgUnit,
+  checkboxUnit,
+} from "@/api/DesignForm/fieldUnit";
+import type { FormInstance, FormRules, ElNotification } from "element-plus";
+import { gainFormPageListCont } from "@/api/DesignForm/requestapi";
+import { Picture, InfoFilled, QuestionFilled } from "@element-plus/icons-vue";
+import request from "@/utils/request";
+import { softDeletion, retractRunWorkFlow } from "@/api/taskapi/management";
 
-import { 
-	formatNumber
-} from '@/api/DesignForm/utils'
+import { formatNumber } from "@/api/DesignForm/utils";
 //引入组件
-import FormPageCont from '@/components/DesignForm/tableListPage/formPageCont.vue'
-import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
-import TimeAxisPage from '@/components/DesignForm/app/timeAxis.vue'
-import CardPage from '@/components/DesignForm/app/cardPage.vue'
-import GanttPage from '@/components/DesignForm/app/gannttPage.vue'
-import MapPage from '@/components/DesignForm/app/mapPage.vue'
-import CalendarPage from '@/components/DesignForm/app/calendar/calendar1/calendarPage.vue'
-import SearchSelect from '@/components/DesignForm/app/calendar/selectSearch.vue'
+import FormPageCont from "@/components/DesignForm/tableListPage/formPageCont.vue";
+import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue";
+import TimeAxisPage from "@/components/DesignForm/app/timeAxis.vue";
+import CardPage from "@/components/DesignForm/app/cardPage.vue";
+import GanttPage from "@/components/DesignForm/app/gannttPage.vue";
+import MapPage from "@/components/DesignForm/app/mapPage.vue";
+import CalendarPage from "@/components/DesignForm/app/calendar/calendar1/calendarPage.vue";
+import SearchSelect from "@/components/DesignForm/app/calendar/selectSearch.vue";
 
 const props = withDefaults(
-    defineProps<{
-		data: FormPageList
-		searchData?: attrButton[]
-		config:FormPageConfig
-		formId?:string
-		beforeRequest?: (params: any, rout: any) => any
-		afterResponse?: (result: any) => any | string
-		beforeDelete?: (params: any, route: any) => any
-		showPage?: boolean
-		requestUrl?: string // 请求的api
-		deleteUrl?: string // 删除的api
-		dict?: { [key: string | number]: string | number }
-		fixedBottomScroll?: boolean
-		query?: { [key: string]: any } // 一些附加的请求参数
-		autoLoad?: boolean // 初始时自动请求加载数据
-		delKey?: string // 删除标识
-		lookPageIsShow?:boolean,
-		versionid?:string,
-		versiontitle?:string,
-		viewPage?:viewPageType
-    }>(),
-    {
-		showPage: true,
-		data: () => {
-			return { columns: [],controlBtn:[],operateBtn:[],config:{} }
-		},
-		searchData: () => {
-			return []
-		},
-		config:() =>{
-			return {}
-		},
-		dict: () => {
-			return {}
-		},
-		formId:() =>{
-			return ""
-		},
-		versionid:() =>{
-			return ""
-		},
-		versiontitle:() =>{
-			return ""
-		},
-		fixedBottomScroll: true,
-		autoLoad: true,
-		delKey: 'id',
-		query: () => {
-			return {}
-		},
-		lookPageIsShow:() => {
-			return false
-		},
-		viewPage: () => {
-			return []
-		}
-    }
-)
+  defineProps<{
+    data: FormPageList;
+    searchData?: attrButton[];
+    config: FormPageConfig;
+    formId?: string;
+    beforeRequest?: (params: any, rout: any) => any;
+    afterResponse?: (result: any) => any | string;
+    beforeDelete?: (params: any, route: any) => any;
+    showPage?: boolean;
+    requestUrl?: string; // 请求的api
+    deleteUrl?: string; // 删除的api
+    dict?: { [key: string | number]: string | number };
+    fixedBottomScroll?: boolean;
+    query?: { [key: string]: any }; // 一些附加的请求参数
+    autoLoad?: boolean; // 初始时自动请求加载数据
+    delKey?: string; // 删除标识
+    lookPageIsShow?: boolean;
+    versionid?: string;
+    versiontitle?: string;
+    viewPage?: viewPageType;
+  }>(),
+  {
+    showPage: true,
+    data: () => {
+      return { columns: [], controlBtn: [], operateBtn: [], config: {} };
+    },
+    searchData: () => {
+      return [];
+    },
+    config: () => {
+      return {};
+    },
+    dict: () => {
+      return {};
+    },
+    formId: () => {
+      return "";
+    },
+    versionid: () => {
+      return "";
+    },
+    versiontitle: () => {
+      return "";
+    },
+    fixedBottomScroll: true,
+    autoLoad: true,
+    delKey: "id",
+    query: () => {
+      return {};
+    },
+    lookPageIsShow: () => {
+      return false;
+    },
+    viewPage: () => {
+      return [];
+    },
+  }
+);
 const emits = defineEmits<{
-    (e: 'selectionChange', row: any): void
-    (e: 'btnClick', btn: any, row?: any): void // 列表上面及表格列表里添加删除按钮事件
-}>()
-const operState = ref<number>(1)	//操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
-const idList = ref<string[]>([])
-const designStore = useDesignFormStore()
-const route = useRoute()
-const router = useRouter()
-const tableDataList = ref([]) // 表格行数据
-const currentAsfTableDataList = ref([])//当前点击的关联表单数据
-const openTaskDrawer = ref(false)	//新增数据
+  (e: "selectionChange", row: any): void;
+  (e: "btnClick", btn: any, row?: any): void; // 列表上面及表格列表里添加删除按钮事件
+}>();
+const operState = ref<number>(1); //操作状态	1：新增；2：重新发起；3：申请修改；4：提交审批;5:普通表单修改
+const idList = ref<string[]>([]);
+const designStore = useDesignFormStore();
+const route = useRoute();
+const router = useRouter();
+const tableDataList = ref([]); // 表格行数据
+const currentAsfTableDataList = ref([]); //当前点击的关联表单数据
+const openTaskDrawer = ref(false); //新增数据
 
 const state = reactive({
-    loading: false,
-    currentPage: 1,
-    pageSize: props.config?.pageSize || 2,
-    total: 0,
-    selectionChecked: [],
-    dict: {}, // 接口返回的
-    searchFormDown: false,
-    treeValue: {}, // 侧栏树选中的值
-    tableScrollMargin: 0,
-    columnsCheck: designStore.getColumnsCheck(route.path),
-    currentNodeKey: ''
-})
+  loading: false,
+  currentPage: 1,
+  pageSize: props.config?.pageSize || 2,
+  total: 0,
+  selectionChecked: [],
+  dict: {}, // 接口返回的
+  searchFormDown: false,
+  treeValue: {}, // 侧栏树选中的值
+  tableScrollMargin: 0,
+  columnsCheck: designStore.getColumnsCheck(route.path),
+  currentNodeKey: "",
+});
 
-const viewType = ref(1)
-const viewLayout = ref<any>()
+const viewType = ref(1);
+const viewLayout = ref<any>();
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-28 16:03:12
 @ 功能: 判断类型
 */
-const unitIsShow = (val:tableButton,unitName:string) => {
-	// val.pattern
-	switch (val.fieldClass) {
-		case "id":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "masters_key": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "creater": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "creater_time": //自定义表单保留字
-			return timeUnit.includes(unitName);
-			break;
-		case "edit_time": //自定义表单保留字
-			return timeUnit.includes(unitName);
-			break;
-		case "flow_id": //自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "baidumap":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "input":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "radio":		//自定义表单保留字
-			return choiceUnit.includes(unitName);
-			break;
-		case "switch":		//自定义表单保留字
-			return switchUnit.includes(unitName);
-			break;
-		case "orgCentent":		//自定义表单保留字
-			return orgUnit.includes(unitName);
-			break;
-		case "varchar":		//自定义表单保留字
-			return inputUnit.includes(unitName);
-			break;
-		case "checkbox":
-			return checkboxUnit.includes(unitName);
-			break;
-		default:
-			if(val.fieldClass != "datePicker" && val.fieldClass != "timePicker"){
-				return inputUnit.includes(unitName);
-			}
-			break;
-	}
-}
+const unitIsShow = (val: tableButton, unitName: string) => {
+  // val.pattern
+  switch (val.fieldClass) {
+    case "id": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "masters_key": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "creater": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "creater_time": //自定义表单保留字
+      return timeUnit.includes(unitName);
+      break;
+    case "edit_time": //自定义表单保留字
+      return timeUnit.includes(unitName);
+      break;
+    case "flow_id": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "baidumap": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "input": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "radio": //自定义表单保留字
+      return choiceUnit.includes(unitName);
+      break;
+    case "switch": //自定义表单保留字
+      return switchUnit.includes(unitName);
+      break;
+    case "orgCentent": //自定义表单保留字
+      return orgUnit.includes(unitName);
+      break;
+    case "varchar": //自定义表单保留字
+      return inputUnit.includes(unitName);
+      break;
+    case "checkbox":
+      return checkboxUnit.includes(unitName);
+      break;
+    default:
+      if (val.fieldClass != "datePicker" && val.fieldClass != "timePicker") {
+        return inputUnit.includes(unitName);
+      }
+      break;
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-28 13:17:46
 @ 功能: 重置表单
 */
-const ruleSearchForm = ref()
+const ruleSearchForm = ref();
 const resetFields = (formEl: FormInstance | undefined) => {
-	
-	// formEl.resetFields()
-	// console.log("formEl",formEl,formEl.resetFields())
-    // if (!formEl) return
-  	// formEl.resetFields()
-	if(props.searchData && props.searchData.length > 0){
-		props.searchData.forEach((item:any)=>{
-			item.value="";
-		})
-	}
-}
+  // formEl.resetFields()
+  // console.log("formEl",formEl,formEl.resetFields())
+  // if (!formEl) return
+  // formEl.resetFields()
+  if (props.searchData && props.searchData.length > 0) {
+    props.searchData.forEach((item: any) => {
+      item.value = "";
+    });
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 11:36:07
 @ 功能: 功能按钮动作
 */
-const setUpClick = (val:string,id:string) =>{
-	// console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
-	if(val.key == "newAdd"){
-		drawerWith.value = container.value?.clientWidth
-		openTaskDrawer.value = true
-	}else{
-		if(idList.value.length > 0){
-			ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
-				confirmButtonText: "确定",
-				cancelButtonText: "取消",
-				type: "warning",
-			}).then(() => {
-				let sendData = {
-					id:idList.value,
-					isTrue:2
-				}
-				softDeletion(sendData)
-					.then((data)=>{
-						// console.log('cancel!',data)
-						ElNotification({
-							title: '提示信息！',
-							message: data.mag,
-							type: 'success',
-						})
-						getPageData()
-					})
-			});
-		}else{
-			ElMessage.error("你还未选中要删除的项目！");
-		}
-		
-	}
-	
-}
+const setUpClick = (val: string, id: string) => {
+  // console.log("功能按钮动作",val,"----id----->",props.versionid,"-----formId---->",props.versiontitle)
+  if (val.key == "newAdd") {
+    drawerWith.value = container.value?.clientWidth;
+    openTaskDrawer.value = true;
+  } else {
+    if (idList.value.length > 0) {
+      ElMessageBox.confirm("确认删除此数据项?删除后不可恢复！", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        let sendData = {
+          id: idList.value,
+          isTrue: 2,
+        };
+        softDeletion(sendData).then((data) => {
+          // console.log('cancel!',data)
+          ElNotification({
+            title: "提示信息！",
+            message: data.mag,
+            type: "success",
+          });
+          getPageData();
+        });
+      });
+    } else {
+      ElMessage.error("你还未选中要删除的项目！");
+    }
+  }
+};
 
 /**
 @ 作者: 秦东
@@ -235,48 +246,47 @@ const setUpClick = (val:string,id:string) =>{
 @ 功能: 表格选择操作
 */
 const selectionChange = (row: any) => {
-    state.selectionChecked = row
-    emits('selectionChange', row)
-	// console.log('selectionChange', row)
-	idList.value.length = 0
-	// console.log('idList.value-1-->', idList.value)
-	if(row && row.length>0){
-		row.forEach((item:any) => {
-			// console.log('item', item.masters_key)
-			idList.value.push(item.masters_key.toString())
-		})
-	}
-	// console.log('idList.value--->', idList.value)
-}
+  state.selectionChecked = row;
+  emits("selectionChange", row);
+  // console.log('selectionChange', row)
+  idList.value.length = 0;
+  // console.log('idList.value-1-->', idList.value)
+  if (row && row.length > 0) {
+    row.forEach((item: any) => {
+      // console.log('item', item.masters_key)
+      idList.value.push(item.masters_key.toString());
+    });
+  }
+  // console.log('idList.value--->', idList.value)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 13:31:37
 @ 功能: 获取表格头内容
 */
 const columnsFilter = computed(() => {
-	console.log("获取表格头内容",props.data.columns)
-    if (!state.columnsCheck?.length) {
-      	return props.data.columns
-    } else {
-		return props.data.columns.filter((item: any) => {
-			return state.columnsCheck.includes(item.prop || item.type)
-		})
-    }
-	
-})
+  console.log("获取表格头内容", props.data.columns);
+  if (!state.columnsCheck?.length) {
+    return props.data.columns;
+  } else {
+    return props.data.columns.filter((item: any) => {
+      return state.columnsCheck.includes(item.prop || item.type);
+    });
+  }
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:14:36
 @ 功能: 翻页操作
 */
 const handleSizeChange = (page: number) => {
-	// console.log("翻页操作",page)
-    state.pageSize = page
-    getListData(1)
-}
+  // console.log("翻页操作",page)
+  state.pageSize = page;
+  getListData(1);
+};
 const handleCurrentChange = (page: number) => {
-    getListData(page)
-}
+  getListData(page);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:15:16
@@ -284,313 +294,305 @@ const handleCurrentChange = (page: number) => {
 */
 // 筛选查询列表数据
 const getListData = (page?: number) => {
-	if (page) {
-      	state.currentPage = page
+  if (page) {
+    state.currentPage = page;
+  }
+  console.log("筛选查询列表数据--->", page);
+  getPageData();
+};
+watch(
+  () => props.lookPageIsShow,
+  (val: boolean) => {
+    if (val && props.formId != "") {
+      getPageData();
     }
-	console.log("筛选查询列表数据--->",page)
-	getPageData()
-}
-watch(()=>props.lookPageIsShow,(val:boolean)=>{
-	if(val && props.formId != ""){
-		getPageData()
-		
-	}
-})
+  }
+);
 
-const timeAxisRef = ref(null)
-const calendarPageRef = ref(null)
-const cardPageRef = ref(null)
+const timeAxisRef = ref(null);
+const calendarPageRef = ref(null);
+const cardPageRef = ref(null);
 const searchSend = reactive({
-	formId:props.formId,
-	page:state.currentPage,
-	pagesize:state.pageSize,
-	searchData:json2string(props.searchData),
-	viewClass:{}
-})
+  formId: props.formId,
+  page: state.currentPage,
+  pagesize: state.pageSize,
+  searchData: json2string(props.searchData),
+  viewClass: {},
+});
 
-let asfDetails = []
-let asfQueryParams: any[] = []
+let asfDetails = [];
+let asfQueryParams: any[] = [];
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 15:51:32
 @ 功能: 获取数据
 */
 const getPageData = () => {
-	state.loading = true;
-	let sendData = {
-		formId:props.formId,
-		page:state.currentPage,
-		pagesize:state.pageSize,
-		searchData:json2string(props.searchData)
-		//searchData:"id:1"
-	}
-	// console.log("获取列表详细信息",sendData)
+  state.loading = true;
+  let sendData = {
+    formId: props.formId,
+    page: state.currentPage,
+    pagesize: state.pageSize,
+    searchData: json2string(props.searchData),
+    //searchData:"id:1"
+  };
+  // console.log("获取列表详细信息",sendData)
 
-	switch(viewType.value){
-		case 2:
-			nextTick(()=>{
-				state.loading = false
-				// console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
-				calendarPageRef.value.calendarSearchData(sendData)
-			})
-			// calendarPageRef.value.calendarSearchData()
-			break;
-		case 3:
-			nextTick(()=>{
-				state.loading = false
-				// console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
-				timeAxisRef.value.searchTimeList(sendData,1)
-			})
-			
-			break;
-		case 4:
-			state.loading = false
-			break;
-		case 5:
-			state.loading = false
-			break;
-		case 6:
-			nextTick(()=>{
-				state.loading = false
-				cardPageRef.value.getCardList(sendData)
-			})
-			break;
-		default:
+  switch (viewType.value) {
+    case 2:
+      nextTick(() => {
+        state.loading = false;
+        // console.log("获取列表详细信息-------555---------->",calendarPageRef.value)
+        calendarPageRef.value.calendarSearchData(sendData);
+      });
+      // calendarPageRef.value.calendarSearchData()
+      break;
+    case 3:
+      nextTick(() => {
+        state.loading = false;
+        // console.log("获取列表详细信息-------222---------->",timeAxisRef.value)
+        timeAxisRef.value.searchTimeList(sendData, 1);
+      });
 
-			gainFormPageListCont(sendData)
-				.then((data)=>{
-					
-					//console.log("获取列表详细信息----------------->",data)
-					//liwenxuan 关联表单数据获取 start
-					
-					let dataList = data
-					//console.log(dataList)
-					asfDetails = props.data.columns.filter((item: any) => {
-						return item.fieldClass=="associatedForms"
-					})
-					
-					
-					if(asfDetails.length>0&&data.data.list!=null){
-						//console.log(data.data.list)
-						//拼装参数,asf值对象数组
-						asfQueryParams = []
-						for(let j = 0;j< asfDetails.length;j++){
-							let asfQueryParamsItem :any = {}
-							//console.log(asfDetails[j])
-							asfQueryParamsItem.formId = asfDetails[j].control.formid
-							asfQueryParamsItem.field = asfDetails[j].field
-							
-							let asfToSelectIds = []
-							for(let i = 0;i<data.data.list.length;i++){
-								let asfMasterAndAsfId:any = {}
-								asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
-								asfMasterAndAsfId.asfMasterId = data.data.list[i].id
-								
-								asfToSelectIds.push(asfMasterAndAsfId)
-							}
-							asfQueryParamsItem.asfToSelectIds = asfToSelectIds
-							asfQueryParams.push(asfQueryParamsItem)
-						}
-						let queryCount = 0
-						for(let i = 0;i<asfQueryParams[0].asfToSelectIds.length;i++){
-							if(asfQueryParams[0].asfToSelectIds[i].asfId!=""){
-								queryCount++
-							}
-						}
-						//console.log(asfQueryParams)
-						if(queryCount>0){
-							getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {   
-								//console.log(data)
-								for(let i = 0;i<dataList.data.list.length; i++){
-									//console.log(dataList.data.list[i])
-									for(let j = 0;j<data.length;j++){
-										//console.log(data[j])
-										for(let n = 0;n<data[j].list.length;n++){
-											if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-												dataList.data.list[i][data[j].field] = data[j].list[n].label
-											}
-											//console.log(data[j].list[n])
-										}
-										
-										
-									}
-								}
-								tableDataList.value = dataList.data.list
-								
-							});
-						}else{
-							tableDataList.value = data.data.list
-						}
-						
-					}else{
-						tableDataList.value = data.data.list
-						
-					}
-					//liwenxuan 关联表单数据获取 end
-					state.total = data.data.total
-					state.loading = false;
-				})
-				.finally(()=>{
-					state.loading = false;
-				})
+      break;
+    case 4:
+      state.loading = false;
+      break;
+    case 5:
+      state.loading = false;
+      break;
+    case 6:
+      nextTick(() => {
+        state.loading = false;
+        cardPageRef.value.getCardList(sendData);
+      });
+      break;
+    default:
+      gainFormPageListCont(sendData)
+        .then((data) => {
+          //console.log("获取列表详细信息----------------->",data)
+          //liwenxuan 关联表单数据获取 start
 
-	}
-}
+          let dataList = data;
+          //console.log(dataList)
+          asfDetails = props.data.columns.filter((item: any) => {
+            return item.fieldClass == "associatedForms";
+          });
 
+          if (asfDetails.length > 0 && data.data.list != null) {
+            //console.log(data.data.list)
+            //拼装参数,asf值对象数组
+            asfQueryParams = [];
+            for (let j = 0; j < asfDetails.length; j++) {
+              let asfQueryParamsItem: any = {};
+              //console.log(asfDetails[j])
+              asfQueryParamsItem.formId = asfDetails[j].control.formid;
+              asfQueryParamsItem.field = asfDetails[j].field;
 
-const asfGetPageData = (asfFormId: any,asfToSelectMastersKey: any) => {
-	let searchData = [{"id":"id","label":"Id","field":"id","type":"bigint(20)","attribute":"","pattern":"bigint","fieldClass":"id","activeValue":"","inactiveValue":"","config":{"optionsType":0},"control":{"optionsValue3Formid":"","optionsValue3Field":""},"options":[],"isSearch":true,"value":asfToSelectMastersKey}]
-	//state.loading = true;
-	let sendData = {
-		formId:asfFormId,
-		page:1,
-		pagesize:1,
-		searchData:json2string(searchData)
-	}
-	//console.log("asf获取列表详细信息",sendData)
-	gainFormPageListCont(sendData)
-		.then((data)=>{
-			
-			//console.log("获取列表详细信息----------------->",data)
-			//liwenxuan 关联表单数据获取 start
-			
-			let dataList = data
-			//console.log(dataList)
-			asfDetails = props.data.columns.filter((item: any) => {
-				return item.fieldClass=="associatedForms"
-			})
-			
-			
-			if(asfDetails.length>0){
-				//console.log(data.data.list)
-				//拼装参数,asf值对象数组
-				let asfAsfQueryParams = []
-				for(let j = 0;j< asfDetails.length;j++){
-					let asfQueryParamsItem :any = {}
-					//console.log(asfDetails[j])
-					asfQueryParamsItem.formId = asfDetails[j].control.formid
-					asfQueryParamsItem.field = asfDetails[j].field
-					
-					let asfToSelectIds = []
-					for(let i = 0;i<data.data.list.length;i++){
-						let asfMasterAndAsfId:any = {}
-						asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field]
-						asfMasterAndAsfId.asfMasterId = data.data.list[i].id
-						
-						asfToSelectIds.push(asfMasterAndAsfId)
-					}
-					asfQueryParamsItem.asfToSelectIds = asfToSelectIds
-					asfAsfQueryParams.push(asfQueryParamsItem)
-				}
-				let queryCount = 0
-				for(let i = 0;i<asfAsfQueryParams[0].asfToSelectIds.length;i++){
-					if(asfAsfQueryParams[0].asfToSelectIds[i].asfId!=undefined&&asfAsfQueryParams[0].asfToSelectIds[i].asfId!=""){
-						queryCount++
-					}
-				}
-				
-				//console.log(asfAsfQueryParams)
-				if(queryCount>0){
-					getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => {   
-						//console.log(data)
-						for(let i = 0;i<dataList.data.list.length; i++){
-							//console.log(dataList.data.list[i])
-							for(let j = 0;j<data.length;j++){
-								//console.log(data[j])
-								for(let n = 0;n<data[j].list.length;n++){
-									if(dataList.data.list[i].id==data[j].list[n].asfMasterId){
-										dataList.data.list[i][data[j].field] = data[j].list[n].label
-									}
-									//console.log(data[j].list[n])
-								}
-								
-								
-							}
-						}
-						currentAsfTableDataList.value = dataList.data.list
+              let asfToSelectIds = [];
+              for (let i = 0; i < data.data.list.length; i++) {
+                let asfMasterAndAsfId: any = {};
+                asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+                asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
 
-					});
-				}else{
-					currentAsfTableDataList.value = data.data.list
+                asfToSelectIds.push(asfMasterAndAsfId);
+              }
+              asfQueryParamsItem.asfToSelectIds = asfToSelectIds;
+              asfQueryParams.push(asfQueryParamsItem);
+            }
+            let queryCount = 0;
+            for (let i = 0; i < asfQueryParams[0].asfToSelectIds.length; i++) {
+              if (asfQueryParams[0].asfToSelectIds[i].asfId != "") {
+                queryCount++;
+              }
+            }
+            //console.log(asfQueryParams)
+            if (queryCount > 0) {
+              getAsfDataTitlesByIds(asfQueryParams).then(({ data }) => {
+                //console.log(data)
+                for (let i = 0; i < dataList.data.list.length; i++) {
+                  //console.log(dataList.data.list[i])
+                  for (let j = 0; j < data.length; j++) {
+                    //console.log(data[j])
+                    for (let n = 0; n < data[j].list.length; n++) {
+                      if (dataList.data.list[i].id == data[j].list[n].asfMasterId) {
+                        dataList.data.list[i][data[j].field] = data[j].list[n].label;
+                      }
+                      //console.log(data[j].list[n])
+                    }
+                  }
+                }
+                tableDataList.value = dataList.data.list;
+              });
+            } else {
+              tableDataList.value = data.data.list;
+            }
+          } else {
+            tableDataList.value = data.data.list;
+          }
+          //liwenxuan 关联表单数据获取 end
+          state.total = data.data.total;
+          state.loading = false;
+        })
+        .finally(() => {
+          state.loading = false;
+        });
+  }
+};
 
-					
-				}
-				
-			}else{
-				currentAsfTableDataList.value = data.data.list
+const asfGetPageData = (asfFormId: any, asfToSelectMastersKey: any) => {
+  let searchData = [
+    {
+      id: "id",
+      label: "Id",
+      field: "id",
+      type: "bigint(20)",
+      attribute: "",
+      pattern: "bigint",
+      fieldClass: "id",
+      activeValue: "",
+      inactiveValue: "",
+      config: { optionsType: 0 },
+      control: { optionsValue3Formid: "", optionsValue3Field: "" },
+      options: [],
+      isSearch: true,
+      value: asfToSelectMastersKey,
+    },
+  ];
+  //state.loading = true;
+  let sendData = {
+    formId: asfFormId,
+    page: 1,
+    pagesize: 1,
+    searchData: json2string(searchData),
+  };
+  //console.log("asf获取列表详细信息",sendData)
+  gainFormPageListCont(sendData)
+    .then((data) => {
+      //console.log("获取列表详细信息----------------->",data)
+      //liwenxuan 关联表单数据获取 start
 
-				
-				
-			}
-			/* //liwenxuan 关联表单数据获取 end
-			state.total = data.data.total
-			state.loading = false; */
-		})
-		.finally(()=>{
-			/* state.loading = false; */
+      let dataList = data;
+      //console.log(dataList)
+      asfDetails = props.data.columns.filter((item: any) => {
+        return item.fieldClass == "associatedForms";
+      });
 
-			//显示关联表单本条详情
-			tablePageClass.value = 4;	
-			drawerWith.value = container.value?.clientWidth
-			asflookPageInfoIsShow.value = true;
-						
+      if (asfDetails.length > 0) {
+        //console.log(data.data.list)
+        //拼装参数,asf值对象数组
+        let asfAsfQueryParams = [];
+        for (let j = 0; j < asfDetails.length; j++) {
+          let asfQueryParamsItem: any = {};
+          //console.log(asfDetails[j])
+          asfQueryParamsItem.formId = asfDetails[j].control.formid;
+          asfQueryParamsItem.field = asfDetails[j].field;
 
-		})
-		
-}
+          let asfToSelectIds = [];
+          for (let i = 0; i < data.data.list.length; i++) {
+            let asfMasterAndAsfId: any = {};
+            asfMasterAndAsfId.asfId = data.data.list[i][asfDetails[j].field];
+            asfMasterAndAsfId.asfMasterId = data.data.list[i].id;
 
+            asfToSelectIds.push(asfMasterAndAsfId);
+          }
+          asfQueryParamsItem.asfToSelectIds = asfToSelectIds;
+          asfAsfQueryParams.push(asfQueryParamsItem);
+        }
+        let queryCount = 0;
+        for (let i = 0; i < asfAsfQueryParams[0].asfToSelectIds.length; i++) {
+          if (
+            asfAsfQueryParams[0].asfToSelectIds[i].asfId != undefined &&
+            asfAsfQueryParams[0].asfToSelectIds[i].asfId != ""
+          ) {
+            queryCount++;
+          }
+        }
 
+        //console.log(asfAsfQueryParams)
+        if (queryCount > 0) {
+          getAsfDataTitlesByIds(asfAsfQueryParams).then(({ data }) => {
+            //console.log(data)
+            for (let i = 0; i < dataList.data.list.length; i++) {
+              //console.log(dataList.data.list[i])
+              for (let j = 0; j < data.length; j++) {
+                //console.log(data[j])
+                for (let n = 0; n < data[j].list.length; n++) {
+                  if (dataList.data.list[i].id == data[j].list[n].asfMasterId) {
+                    dataList.data.list[i][data[j].field] = data[j].list[n].label;
+                  }
+                  //console.log(data[j].list[n])
+                }
+              }
+            }
+            currentAsfTableDataList.value = dataList.data.list;
+          });
+        } else {
+          currentAsfTableDataList.value = data.data.list;
+        }
+      } else {
+        currentAsfTableDataList.value = data.data.list;
+      }
+      /* //liwenxuan 关联表单数据获取 end
+			state.total = data.data.total
+			state.loading = false; */
+    })
+    .finally(() => {
+      /* state.loading = false; */
+
+      //显示关联表单本条详情
+      tablePageClass.value = 4;
+      drawerWith.value = container.value?.clientWidth;
+      asflookPageInfoIsShow.value = true;
+    });
+};
 
-onMounted(()=>{
-	getPageData()
-	nextTick(()=>{
-		drawerWith.value = container.value?.clientWidth
-	})
-})
+onMounted(() => {
+  getPageData();
+  nextTick(() => {
+    drawerWith.value = container.value?.clientWidth;
+  });
+});
 //liwenxuan 关联表单数据获取 start
 function getAsfDataTitlesByIds(asfQueryParams: any[]) {
-	return request({ 
-		url: '/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds',
-		method: 'post',
-		data: asfQueryParams,
-	});
+  return request({
+    url: "/javasys/lowCode/AssociatedForms/getAsfDataTitlesByIds",
+    method: "post",
+    data: asfQueryParams,
+  });
 }
 //liwenxuan 关联表单数据获取 end
-const asfShowDetailsFlag = ref(false)
+const asfShowDetailsFlag = ref(false);
 //liwenxuan 关联表单详情弹窗 start
-function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
-	let val = scope.row
-	//asfShowDetailsFlag.value= true
-	/* console.log("item----------------->",item)
+function showAsfDetailDialog(item: any, scope: any, asfQueryParams: any) {
+  let val = scope.row;
+  //asfShowDetailsFlag.value= true
+  /* console.log("item----------------->",item)
 	console.log("scope----------------->",scope)
 	console.log("asfQueryParams----------------->",asfQueryParams)
 	console.log("val----------------->",val) */
-	let asfFormId = item.control.formid//关联表单在customer_form中的id
-	//alert("asfFormId:"+asfFormId)
-	let scopeColumnProperty = scope.column.property//exp:associatedForms1720570283525
-
-	let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id
-	//alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
-	let asfToSelectMastersKey = ""
-	for(let i = 0;i<asfQueryParams.length;i++){
-		if(asfQueryParams[i].field == scopeColumnProperty){
-			
-			for(let j = 0;j<asfQueryParams[i].asfToSelectIds.length;j++){
-				
-				if(asfQueryParams[i].asfToSelectIds[j].asfMasterId==asfQueryParamsNAsfToSelectIdsNAsfMasterId){
-					asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId
-					
-				}
-			}
-		}
-	}
-	//alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
+  let asfFormId = item.control.formid; //关联表单在customer_form中的id
+  //alert("asfFormId:"+asfFormId)
+  let scopeColumnProperty = scope.column.property; //exp:associatedForms1720570283525
 
+  let asfQueryParamsNAsfToSelectIdsNAsfMasterId = val.id;
+  //alert(asfQueryParamsNAsfToSelectIdsNAsfMasterId)
+  let asfToSelectMastersKey = "";
+  for (let i = 0; i < asfQueryParams.length; i++) {
+    if (asfQueryParams[i].field == scopeColumnProperty) {
+      for (let j = 0; j < asfQueryParams[i].asfToSelectIds.length; j++) {
+        if (
+          asfQueryParams[i].asfToSelectIds[j].asfMasterId ==
+          asfQueryParamsNAsfToSelectIdsNAsfMasterId
+        ) {
+          asfToSelectMastersKey = asfQueryParams[i].asfToSelectIds[j].asfId;
+        }
+      }
+    }
+  }
+  //alert("asfToSelectMastersKey:"+asfToSelectMastersKey)
 
-	
-	
-	asfGetPageData(asfFormId,asfToSelectMastersKey)
-	
+  asfGetPageData(asfFormId, asfToSelectMastersKey);
 }
 //liwenxuan 关联表单详情弹窗 end
 
@@ -600,752 +602,883 @@ function showAsfDetailDialog(item: any,scope: any,asfQueryParams: any){
 @ 功能: 判断单选值
 */
 const judjeRadio = (val: any, options: any[]) => {
-	// console.log("判断单选值",val, options)
-	if(options && options.length > 0){
-		options.forEach((item)=>{
-			if(item.value == val){
-				// console.log("判断单选值",val, item.value,item.label)
-				val =  item.label
-			}
-		})
-	}
-	if(val == 0 || val == "0"){
-		val = ""
-	}
-	return val
-}
+  // console.log("判断单选值",val, options)
+  if (options && options.length > 0) {
+    options.forEach((item) => {
+      if (item.value == val) {
+        // console.log("判断单选值",val, item.value,item.label)
+        val = item.label;
+      }
+    });
+  }
+  if (val == 0 || val == "0") {
+    val = "";
+  }
+  return val;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-02 14:49:40
 @ 功能: 判断开关类型
 */
-const judjeSwitch = (val:any,yesVal:any) => {
-	if(val == yesVal) return true;
-	return false;
-}
+const judjeSwitch = (val: any, yesVal: any) => {
+  if (val == yesVal) return true;
+  return false;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 13:13:56
 @ 功能: 列表信息删除信息
 */
-const confirmEvent = (val:any) => {
-	let sendData = {
-		id:[val.masters_key],
-		isTrue:2
-	}
-	softDeletion(sendData)
-		.then((data)=>{
-			// console.log('cancel!',data)
-			ElNotification({
-				title: '系统提示！',
-				message: data.mag?data.mag:"删除成功",
-				type: 'success',
-			})
-			getPageData()
-		})
-}
-const cancelEvent = (val:any) => {
-//   console.log('cancel!',val)
-}
-const container = ref()	//实例化内容容器
-const drawerWith = ref();	//编辑表单时抽屉宽度
+const confirmEvent = (val: any) => {
+  let sendData = {
+    id: [val.masters_key],
+    isTrue: 2,
+  };
+  softDeletion(sendData).then((data) => {
+    // console.log('cancel!',data)
+    ElNotification({
+      title: "系统提示！",
+      message: data.mag ? data.mag : "删除成功",
+      type: "success",
+    });
+    getPageData();
+  });
+};
+const cancelEvent = (val: any) => {
+  //   console.log('cancel!',val)
+};
+const container = ref(); //实例化内容容器
+const drawerWith = ref(); //编辑表单时抽屉宽度
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-03 13:24:06
 @ 功能: 查看详细内容
 */
-const tablePageClass = ref(1)
-const lookPageInfoIsShow = ref(false)
-const asflookPageInfoIsShow = ref(false)
-const pageInfoCont = ref<any>()
-const lookPageInfo = (val:any) => {
-	tablePageClass.value = 4;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-	
-}
+const tablePageClass = ref(1);
+const lookPageInfoIsShow = ref(false);
+const asflookPageInfoIsShow = ref(false);
+const pageInfoCont = ref<any>();
+const lookPageInfo = (val: any) => {
+  console.log("查看详细内容======================?>", val);
+  tablePageClass.value = 4;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-05 11:29:50
 @ 功能: 编辑表单内容
 */
 
-const editInfo = (val:any) => {
-	// console.log('修改数据!',val)
-	operState.value = 5;
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const editInfo = (val: any) => {
+  // console.log('修改数据!',val)
+  operState.value = 5;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-10 15:32:55
 @ 功能: 提交审批
 */
-const submitApproval = (val:any) => {
-	operState.value = 4
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const submitApproval = (val: any) => {
+  operState.value = 4;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 09:36:59
 @ 功能: 撤回申请
 */
-const withdrawApplication  = (val:any) => {
-	// console.log("撤回申请", val);
-	let sendInfo = {
-		id: val.masters_key,
-	}
-	retractRunWorkFlow(sendInfo)
-		.then((data)=>{
-			ElMessage({
-				message: '撤回成功！',
-				type: 'success'
-			})
-			getPageData()
-		})
-}
+const withdrawApplication = (val: any) => {
+  // console.log("撤回申请", val);
+  let sendInfo = {
+    id: val.masters_key,
+  };
+  retractRunWorkFlow(sendInfo).then((data) => {
+    ElMessage({
+      message: "撤回成功！",
+      type: "success",
+    });
+    getPageData();
+  });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:17:42
 @ 功能: 重新提交申请
 */
-const afreshSendFlow = (val:any) => {
-	operState.value = 2
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const afreshSendFlow = (val: any) => {
+  operState.value = 2;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-11 11:19:21
 @ 功能: 申请修改数据
 */
-const editFormSendFlow = (val:any) => {
-	operState.value = 3
-	tablePageClass.value = 2;
-	pageInfoCont.value = val
-	drawerWith.value = container.value?.clientWidth
-	lookPageInfoIsShow.value = true;
-}
+const editFormSendFlow = (val: any) => {
+  operState.value = 3;
+  tablePageClass.value = 2;
+  pageInfoCont.value = val;
+  drawerWith.value = container.value?.clientWidth;
+  lookPageInfoIsShow.value = true;
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-08 09:39:52
 @ 功能: 切换视图展示方式
 */
-const tabsView = (val:any,types:number) => {
-	viewType.value = types
-	val.isClick = true
-	viewLayout.value = val
-	// console.log("切换视图展示方式",val)
-	switch(types){
-		case 2:
-			props.viewPage.list.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 3:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			getPageData()
-			break;
-		case 4:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.map.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 5:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.card.isClick = false
-			break;
-		case 6:
-			props.viewPage.list.isClick = false
-			props.viewPage.date.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			break;
-		default:
-			props.viewPage.date.isClick = false
-			props.viewPage.card.isClick = false
-			props.viewPage.time.isClick = false
-			props.viewPage.gantt.isClick = false
-			props.viewPage.map.isClick = false
-			break;
-	}
-}
+const tabsView = (val: any, types: number) => {
+  viewType.value = types;
+  val.isClick = true;
+  viewLayout.value = val;
+  // console.log("切换视图展示方式",val)
+  switch (types) {
+    case 2:
+      props.viewPage.list.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 3:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      getPageData();
+      break;
+    case 4:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.map.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 5:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.card.isClick = false;
+      break;
+    case 6:
+      props.viewPage.list.isClick = false;
+      props.viewPage.date.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      break;
+    default:
+      props.viewPage.date.isClick = false;
+      props.viewPage.card.isClick = false;
+      props.viewPage.time.isClick = false;
+      props.viewPage.gantt.isClick = false;
+      props.viewPage.map.isClick = false;
+      break;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 08:30:49
 @ 功能: 判断是否有标题
 */
-const writeListTitle = (val:any,viewConfig:any) => {
-	// console.log("判断是否有标题--1-->",val)
-	// console.log("判断是否有标题--2-->",viewConfig)
-	var titleAry = [];
-	if(viewConfig.form && viewConfig.form.title){
-		if(viewConfig.form.title.length > 0){
-			viewConfig.form.title.forEach((item,index)=>{
-				// console.log("判断是否有标题--"+index+"-->",val[item])
-				if(val[item]){
-					titleAry.push(val[item])
-				}
-			})
-		}
-	}
-	if(titleAry.length > 0){
-		return titleAry.join()
-	}else{
-		let firstWord = ""
-				let powerAry = ["id","creater_time","edit_time","masters_key","states","flow_id"];
-				for (let key in val) {
-					if (val.hasOwnProperty(key)) {
-						if(!powerAry.includes(key)){
-							if(val[key] != '' && val[key] != null){
-								firstWord = val[key]
-							}
-						}
-					}
-				}
-				return firstWord
-	}
-	
-}
+const writeListTitle = (val: any, viewConfig: any) => {
+  // console.log("判断是否有标题--1-->",val)
+  // console.log("判断是否有标题--2-->",viewConfig)
+  var titleAry = [];
+  if (viewConfig.form && viewConfig.form.title) {
+    if (viewConfig.form.title.length > 0) {
+      viewConfig.form.title.forEach((item, index) => {
+        // console.log("判断是否有标题--"+index+"-->",val[item])
+        if (val[item]) {
+          titleAry.push(val[item]);
+        }
+      });
+    }
+  }
+  if (titleAry.length > 0) {
+    return titleAry.join();
+  } else {
+    let firstWord = "";
+    let powerAry = [
+      "id",
+      "creater_time",
+      "edit_time",
+      "masters_key",
+      "states",
+      "flow_id",
+    ];
+    for (let key in val) {
+      if (val.hasOwnProperty(key)) {
+        if (!powerAry.includes(key)) {
+          if (val[key] != "" && val[key] != null) {
+            firstWord = val[key];
+          }
+        }
+      }
+    }
+    return firstWord;
+  }
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-25 10:27:21
 @ 功能: 判断是否有标题
 */
-const judgeListTitle = (val:any,viewConfig:any) => {
-	// console.log("判断是否有标题--3-->",val)
-	// console.log("判断是否有标题--4-->",viewConfig)
-	if(val && val.fieldClass=='_lableTitle'){
-		if(viewConfig.form && viewConfig.form.title){
-			if(viewConfig.form.title.length > 0){
-				return true
-			}
-		}
-	}
-	return false
-}
+const judgeListTitle = (val: any, viewConfig: any) => {
+  // console.log("判断是否有标题--3-->",val)
+  // console.log("判断是否有标题--4-->",viewConfig)
+  if (val && val.fieldClass == "_lableTitle") {
+    if (viewConfig.form && viewConfig.form.title) {
+      if (viewConfig.form.title.length > 0) {
+        return true;
+      }
+    }
+  }
+  return false;
+};
 // 选择数据转换，默认尝试转数字
 const transformOption = (val: string | number, type?: string) => {
-    
-    return formatNumber(val)
- }
+  return formatNumber(val);
+};
 </script>
 <template>
-	<div ref="container" v-loading="state.loading" class="table-list-comm">
-	
-		<el-row class="rowBox">
-			<el-col :span="24">
-				<el-form  v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
-					<template v-for="(item, index) in searchData" :key="index">
-						<div class="group group-input">
-							<el-form-item :label="item.label"  class="form_cont">
-								<el-input
-									v-model="item.value"
-									:placeholder="'请输入'+item.label"
-									clearable
-									v-if="unitIsShow(item,'input')"
-								/>
-								<el-date-picker
-									v-model="item.value"
-									type="datetime"
-									:placeholder="'请选择'+item.label"
-									:shortcuts="shortcuts"
-									v-if="unitIsShow(item,'time')"
-								/>
-								<SearchSelect
-									v-if="unitIsShow(item,'radio')"
-									:data="item"
-									:disabled="false"
-									:transform-option="transformOption"
-									v-model:model-value="item.value"
-								/>
-								<el-select
-									v-model="item.value"
-									clearable
-									:placeholder="'请选择'+item.label"
-									v-if="unitIsShow(item,'switch')"
-								>
-									<el-option
-										:key="item.activeValue"
-										label="是"
-										:value="item.activeValue"
-									/>
-									<el-option
-										:key="item.inactiveValue"
-										label="否"
-										:value="item.inactiveValue"
-									/>
-								</el-select>
-								<SearchSelect
-									v-if="unitIsShow(item,'checkbox')"
-									:data="item"
-									:disabled="false"
-									:is-checkbox="true"
-									:transform-option="transformOption"
-									v-model:model-value="item.value"
-								/>
-								<el-date-picker
-									v-if="item.fieldClass == 'datePicker'"
-									v-model="item.value"
-									:type="item.auxiliary"
-									:placeholder="'请选择'+item.label"
-									value-format="x"
-								/>
-								<el-time-picker
-									v-if="item.fieldClass == 'timePicker'"
-									v-model="item.value"
-									arrow-control
-									:placeholder="'请选择'+item.label"
-									value-format="x"
-								/>
-								<el-select
-									v-model="item.value"
-									clearable
-									:placeholder="'请选择'+item.label"
-									v-if="unitIsShow(item,'org')"
-								>
-								</el-select>
-							</el-form-item>
-						</div>
-						
-					</template>
-					<div class="group group-btn" v-if="searchData.length">
-						<el-button type="primary" @click="getPageData"><el-icon><Search /></el-icon>查询</el-button>
-						<el-button @click="resetFields(ruleSearchForm)"><el-icon><Refresh /></el-icon>重置</el-button>
-					</div>
-				</el-form>
-			</el-col>
-			<el-col :span="24">
-				<div class="operateButArea">
-					<div class="operatLeft">
-						<el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info">操作按钮区域</el-text>
-						<el-button
-							v-for="item in data.controlBtn"
-							v-bind="item"
-							:key="item.type"
-							@click="setUpClick(item)"
-						>
-							{{ item.label }}
-						</el-button>
-					</div>
-					<div>
-						<el-button-group class="ml-4">
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="折叠查询表单"
-								placement="bottom"
-							>
-								<el-button size="small" @click="config.searchIsShow=!config.searchIsShow" class="fa fa-search" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.list.status"
-								class="box-item"
-								effect="dark"
-								content="列表视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-table"  :color="viewPage.list.isClick?'#a0cfff':''" @click="tabsView(viewPage.list,1)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="props.viewPage.card&&props.viewPage.card.status"
-								class="box-item"
-								effect="dark"
-								content="卡片视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-id-card-o"  :color="props.viewPage.card&&props.viewPage.card.isClick?'#a0cfff':''" @click="tabsView(props.viewPage.card,6)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.date.status"
-								class="box-item"
-								effect="dark"
-								content="日历视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-calendar"  :color="viewPage.date.isClick?'#a0cfff':''" @click="tabsView(viewPage.date,2)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.time.status"
-								class="box-item"
-								effect="dark"
-								content="时间轴"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-clock-o"  :color="viewPage.time.isClick?'#a0cfff':''" @click="tabsView(viewPage.time,3)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.gantt.status"
-								class="box-item"
-								effect="dark"
-								content="甘特图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-bar-chart"  :color="viewPage.gantt.isClick?'#a0cfff':''" @click="tabsView(viewPage.gantt,4)" />
-							</el-tooltip>
-							<el-tooltip
-								v-if="viewPage.map.status"
-								class="box-item"
-								effect="dark"
-								content="地图视图"
-								placement="top"
-							>
-								<el-button size="small" class="fa fa-map-signs"  :color="viewPage.map.isClick?'#a0cfff':''" @click="tabsView(viewPage.map,5)" />
-							</el-tooltip>
-							
-						</el-button-group>
-					</div>
-				</div>
-			</el-col>
-			<el-col v-if="viewType==1" :span="24">
-				<el-table
-					v-bind="data.tableProps"
-					ref="table"
-					:data="tableDataList"
-					@selection-change="selectionChange"
-					table-layout="fixed"
-				>
-					<template
-						v-for="item in columnsFilter"
-						:key="item.id || item.label"
-					>
-					
-						<el-table-column v-if="['-'].includes(item.fieldClass)" :type="item.type" :prop="item.field" :label="item.label" config="" width="60" fixed>
-							<template v-if="item.help" #header="scope">
-								{{ scope.column.label }}
-								<tooltip :content="item.help" />
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass=='__control'"  :prop="item.field" :label="item.label" config="" width="200"  align="center"  fixed="right" >
-							<template #default="scope">
-								<el-button-group>
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==1"
-										class="box-item"
-										effect="dark"
-										content="提交审批"
-										placement="top-end"
-									>
-										<el-button type="success" size="small" class="fa fa-send-o"   @click="submitApproval(scope.row)" />
-									</el-tooltip>
+  <div ref="container" v-loading="state.loading" class="table-list-comm">
+    <el-row class="rowBox">
+      <el-col :span="24">
+        <el-form v-if="config.searchIsShow" ref="ruleSearchForm" class="seacherForm">
+          <template v-for="(item, index) in searchData" :key="index">
+            <div class="group group-input">
+              <el-form-item :label="item.label" class="form_cont">
+                <el-input
+                  v-model="item.value"
+                  :placeholder="'请输入' + item.label"
+                  clearable
+                  v-if="unitIsShow(item, 'input')"
+                />
+                <el-date-picker
+                  v-model="item.value"
+                  type="datetime"
+                  :placeholder="'请选择' + item.label"
+                  :shortcuts="shortcuts"
+                  v-if="unitIsShow(item, 'time')"
+                />
+                <SearchSelect
+                  v-if="unitIsShow(item, 'radio')"
+                  :data="item"
+                  :disabled="false"
+                  :transform-option="transformOption"
+                  v-model:model-value="item.value"
+                />
+                <el-select
+                  v-model="item.value"
+                  clearable
+                  :placeholder="'请选择' + item.label"
+                  v-if="unitIsShow(item, 'switch')"
+                >
+                  <el-option
+                    :key="item.activeValue"
+                    label="是"
+                    :value="item.activeValue"
+                  />
+                  <el-option
+                    :key="item.inactiveValue"
+                    label="否"
+                    :value="item.inactiveValue"
+                  />
+                </el-select>
+                <SearchSelect
+                  v-if="unitIsShow(item, 'checkbox')"
+                  :data="item"
+                  :disabled="false"
+                  :is-checkbox="true"
+                  :transform-option="transformOption"
+                  v-model:model-value="item.value"
+                />
+                <el-date-picker
+                  v-if="item.fieldClass == 'datePicker'"
+                  v-model="item.value"
+                  :type="item.auxiliary"
+                  :placeholder="'请选择' + item.label"
+                  value-format="x"
+                />
+                <el-time-picker
+                  v-if="item.fieldClass == 'timePicker'"
+                  v-model="item.value"
+                  arrow-control
+                  :placeholder="'请选择' + item.label"
+                  value-format="x"
+                />
+                <el-select
+                  v-model="item.value"
+                  clearable
+                  :placeholder="'请选择' + item.label"
+                  v-if="unitIsShow(item, 'org')"
+                >
+                </el-select>
+              </el-form-item>
+            </div>
+          </template>
+          <div class="group group-btn" v-if="searchData.length">
+            <el-button type="primary" @click="getPageData"
+              ><el-icon><Search /></el-icon>查询</el-button
+            >
+            <el-button @click="resetFields(ruleSearchForm)"
+              ><el-icon><Refresh /></el-icon>重置</el-button
+            >
+          </div>
+        </el-form>
+      </el-col>
+      <el-col :span="24">
+        <div class="operateButArea">
+          <div class="operatLeft">
+            <el-text v-if="data.controlBtn.length === 0" class="mx-1 tipBox" type="info"
+              >操作按钮区域</el-text
+            >
+            <el-button
+              v-for="item in data.controlBtn"
+              v-bind="item"
+              :key="item.type"
+              @click="setUpClick(item)"
+            >
+              {{ item.label }}
+            </el-button>
+          </div>
+          <div>
+            <el-button-group class="ml-4">
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                content="折叠查询表单"
+                placement="bottom"
+              >
+                <el-button
+                  size="small"
+                  @click="config.searchIsShow = !config.searchIsShow"
+                  class="fa fa-search"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.list.status"
+                class="box-item"
+                effect="dark"
+                content="列表视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-table"
+                  :color="viewPage.list.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.list, 1)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="props.viewPage.card && props.viewPage.card.status"
+                class="box-item"
+                effect="dark"
+                content="卡片视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-id-card-o"
+                  :color="
+                    props.viewPage.card && props.viewPage.card.isClick ? '#a0cfff' : ''
+                  "
+                  @click="tabsView(props.viewPage.card, 6)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.date.status"
+                class="box-item"
+                effect="dark"
+                content="日历视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-calendar"
+                  :color="viewPage.date.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.date, 2)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.time.status"
+                class="box-item"
+                effect="dark"
+                content="时间轴"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-clock-o"
+                  :color="viewPage.time.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.time, 3)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.gantt.status"
+                class="box-item"
+                effect="dark"
+                content="甘特图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-bar-chart"
+                  :color="viewPage.gantt.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.gantt, 4)"
+                />
+              </el-tooltip>
+              <el-tooltip
+                v-if="viewPage.map.status"
+                class="box-item"
+                effect="dark"
+                content="地图视图"
+                placement="top"
+              >
+                <el-button
+                  size="small"
+                  class="fa fa-map-signs"
+                  :color="viewPage.map.isClick ? '#a0cfff' : ''"
+                  @click="tabsView(viewPage.map, 5)"
+                />
+              </el-tooltip>
+            </el-button-group>
+          </div>
+        </div>
+      </el-col>
+      <el-col v-if="viewType == 1" :span="24">
+        <el-table
+          v-bind="data.tableProps"
+          ref="table"
+          :data="tableDataList"
+          @selection-change="selectionChange"
+          table-layout="fixed"
+        >
+          <template v-for="item in columnsFilter" :key="item.id || item.label">
+            <el-table-column
+              v-if="['-'].includes(item.fieldClass)"
+              :type="item.type"
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              width="60"
+              fixed
+            >
+              <template v-if="item.help" #header="scope">
+                {{ scope.column.label }}
+                <tooltip :content="item.help" />
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == '__control'"
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              width="200"
+              align="center"
+              fixed="right"
+            >
+              <template #default="scope">
+                <el-button-group>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 1"
+                    class="box-item"
+                    effect="dark"
+                    content="提交审批"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="success"
+                      size="small"
+                      class="fa fa-send-o"
+                      @click="submitApproval(scope.row)"
+                    />
+                  </el-tooltip>
 
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==2"
-										class="box-item"
-										effect="dark"
-										content="重新申请"
-										placement="top-end"
-									>
-										<el-button type="warning" size="small" class="fa fa-retweet"  @click="afreshSendFlow(scope.row)" />
-									</el-tooltip>
-									<el-tooltip
-										class="box-item"
-										effect="dark"
-										content="查看详情"
-										placement="top-end"
-									>
-										<el-button @click="lookPageInfo(scope.row)" type="primary" size="small" class="fa fa-eye"  />
-									</el-tooltip>
-									<el-popconfirm
-										v-if="scope.row.flowIsOpen==1&&scope.row.isRetract"
-										confirm-button-text="确定"
-										cancel-button-text="取消"
-										:icon="QuestionFilled"
-										icon-color="#F56C6C"
-										title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
-										@confirm="withdrawApplication (scope.row)"
-										@cancel="cancelEvent(scope.row)"
-									>
-										<template #reference>
-											<el-button  size="small" class="fa fa-reply-all"  />
-										</template>
-									</el-popconfirm>
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==2"
-										class="box-item"
-										effect="dark"
-										content="编辑"
-										placement="top-end"
-									>
-										<el-button @click="editInfo(scope.row)" type="info" size="small" class="fa fa-edit"  />
-									</el-tooltip>
-									<el-popconfirm
-										v-if="scope.row.taskStatus==2||scope.row.taskStatus==1"
-										confirm-button-text="确定"
-										cancel-button-text="取消"
-										:icon="QuestionFilled"
-										icon-color="#F56C6C"
-										title="您确定要删除此条记录?一经删除！数据将不可恢复！"
-										@confirm="confirmEvent(scope.row)"
-										@cancel="cancelEvent(scope.row)"
-									>
-										<template #reference>
-											<el-button type="danger" size="small" class="fa fa-trash-o"  />
-										</template>
-									</el-popconfirm>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 2"
+                    class="box-item"
+                    effect="dark"
+                    content="重新申请"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="warning"
+                      size="small"
+                      class="fa fa-retweet"
+                      @click="afreshSendFlow(scope.row)"
+                    />
+                  </el-tooltip>
+                  <el-tooltip
+                    class="box-item"
+                    effect="dark"
+                    content="查看详情"
+                    placement="top-end"
+                  >
+                    <el-button
+                      @click="lookPageInfo(scope.row)"
+                      type="primary"
+                      size="small"
+                      class="fa fa-eye"
+                    />
+                  </el-tooltip>
+                  <el-popconfirm
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.isRetract"
+                    confirm-button-text="确定"
+                    cancel-button-text="取消"
+                    :icon="QuestionFilled"
+                    icon-color="#F56C6C"
+                    title="您确定要撤回此次申请？一经撤回！需要此流程重新提交申请！"
+                    @confirm="withdrawApplication(scope.row)"
+                    @cancel="cancelEvent(scope.row)"
+                  >
+                    <template #reference>
+                      <el-button size="small" class="fa fa-reply-all" />
+                    </template>
+                  </el-popconfirm>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 2"
+                    class="box-item"
+                    effect="dark"
+                    content="编辑"
+                    placement="top-end"
+                  >
+                    <el-button
+                      @click="editInfo(scope.row)"
+                      type="info"
+                      size="small"
+                      class="fa fa-edit"
+                    />
+                  </el-tooltip>
+                  <el-popconfirm
+                    v-if="scope.row.taskStatus == 2 || scope.row.taskStatus == 1"
+                    confirm-button-text="确定"
+                    cancel-button-text="取消"
+                    :icon="QuestionFilled"
+                    icon-color="#F56C6C"
+                    title="您确定要删除此条记录?一经删除！数据将不可恢复！"
+                    @confirm="confirmEvent(scope.row)"
+                    @cancel="cancelEvent(scope.row)"
+                  >
+                    <template #reference>
+                      <el-button type="danger" size="small" class="fa fa-trash-o" />
+                    </template>
+                  </el-popconfirm>
 
-									<el-tooltip
-										v-if="scope.row.flowIsOpen==1&&scope.row.taskStatus==4"
-										class="box-item"
-										effect="dark"
-										content="申请修改"
-										placement="top-end"
-									>
-										<el-button type="info" size="small" class="fa fa-edit" @click="editFormSendFlow(scope.row)" />
-									</el-tooltip>
-								</el-button-group>
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass=='_lableTitle'" label="标题" config="" min-width="320">
-							<template #default="scope">
-								{{writeListTitle(scope.row,viewPage.list)}}
-							</template>
-						</el-table-column>
-						<el-table-column v-else-if="item.fieldClass==''" :prop="item.field" :label="item.label" min-width="320">
-							
-						</el-table-column>
-						<el-table-column v-else  :prop="item.field" :label="item.label" config=""  min-width="220">
-							<template v-if="item.help" #header="scope">
-								{{ scope.column.label }}
-								<tooltip :content="item.help" />
-							</template>
-							
-							<template v-if="item.fieldClass=='select'" #default="scope"> 
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass==''" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								<el-tag v-if="scope.row[scope.column.property]==1" type="success">启用</el-tag>
-								<el-tag v-if="scope.row[scope.column.property]==2" type="danger">已禁用</el-tag>
-								<el-tag v-if="scope.row[scope.column.property]==3" type="info">已删除</el-tag>
-							</template>
-							<template v-if="item.fieldClass=='deptOrg'" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass=='owner'" #default="scope"> 
-								<!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
-								{{ scope.row[scope.column.property] }}
-							</template>
-							<template v-if="item.fieldClass=='lowcodeImage'" #default="scope"> 
-								<el-image style="width: 30px; height: 30px" :src="scope.row[scope.column.property]" :fit="fit" />
-							</template>
-							<template v-if="item.fieldClass=='expand-user'" #default="scope"> 
-								{{ scope.row[scope.column.property] }} <!--选择用户-->
-							</template>
-							<template v-if="item.fieldClass=='radio'" #default="scope">
-								<!-- {{scope.row[scope.column.property]}}{{item}} -->
-								{{ judjeRadio(scope.row[scope.column.property],item.options) }}
-							</template>
-							<template v-if="item.fieldClass=='upload'" #default="scope" >
-							<div class="demo-image__error">
-								<el-image
-									style="width: 30px; height: 30px"
-									:src="scope.row[scope.column.property]"
-								>
-									<template #error>
-										<div class="image-slot">
-											<el-icon><Picture /></el-icon>
-										</div>
-									</template>
-								</el-image>
-							</div>
-							</template>
-							<template v-if="item.fieldClass=='switch'" #default="scope">	
-								
-								<el-tag
-									v-if="judjeSwitch(scope.row[scope.column.property],item.activeValue)"
-									type="success"
-									effect="light"
-								>
-									启用
-								</el-tag>
-								<el-tag
-									v-else
-									type="danger"
-									effect="light"
-								>
-									禁用
-								</el-tag>
-							</template>
-							<template v-if="item.fieldClass=='baidumap'" #default="scope">
-								{{scope.row[scope.column.property]}}
-							</template>
-							<template v-if="item.fieldClass=='associatedForms'" #default="scope">
-								<el-link
-									key="primary"
-									type="primary"
-									@click="showAsfDetailDialog(item,scope,asfQueryParams)"
-									>
-									
-									{{scope.row[scope.column.property]}}
-								</el-link>
-							</template>
-						</el-table-column>
-					</template>
-				</el-table>
-			</el-col>
-			<el-col v-if="viewType==1&&state.total > 0" :span="24">
-				<div class="pageBox">
-					<el-pagination
-						v-model:currentPage="state.currentPage"
-						v-model:page-size="state.pageSize"
-						:page-sizes="[20, 30, 40, 50] as any"
-						:total="state.total"
-						layout="total, sizes, prev, pager, next, jumper"
-						@size-change="handleSizeChange"
-						@current-change="handleCurrentChange"
-					/>
-				</div>
-			</el-col>
-			<el-col  v-if="viewType==2" :span="24">
-				<CalendarPage  ref="calendarPageRef"  :search-send="searchSend" :body-hight="265" :drawer-with="drawerWith" :view-setup="viewPage.card"  />
-			</el-col>
-			<el-col  v-if="viewType==3" :span="24">
-				<TimeAxisPage  ref="timeAxisRef" :data="tableDataList" :view-layout="viewLayout" :columns-filter="columnsFilter" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.time" />
-			</el-col>
-			<el-col  v-if="viewType==4" :span="24">
-				<GanttPage ref="ganttPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.gantt" />
-			</el-col>
-			<el-col  v-if="viewType==5" :span="24">
-				<MapPage ref="mapPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.map" />
-			</el-col>
-			<el-col  v-if="viewType==6" :span="24">
-				<CardPage ref="cardPageRef" :search-send="searchSend" :drawer-with="drawerWith" :view-setup="viewPage.card"  :columns-filter="columnsFilter"  />
-			</el-col>
-			<el-col :span="24"  style="display:none">
-			
-				{{ tableDataList}}
-			</el-col>
-			<el-col :span="24" style="display:none">
-				<el-button-group>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="提交审批"
-								placement="top-end"
-							>
-								<el-button type="success" size="small" class="fa fa-send-o" />
-							</el-tooltip>
+                  <el-tooltip
+                    v-if="scope.row.flowIsOpen == 1 && scope.row.taskStatus == 4"
+                    class="box-item"
+                    effect="dark"
+                    content="申请修改"
+                    placement="top-end"
+                  >
+                    <el-button
+                      type="info"
+                      size="small"
+                      class="fa fa-edit"
+                      @click="editFormSendFlow(scope.row)"
+                    />
+                  </el-tooltip>
+                </el-button-group>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == '_lableTitle'"
+              label="标题"
+              config=""
+              min-width="320"
+            >
+              <template #default="scope">
+                {{ writeListTitle(scope.row, viewPage.list) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-else-if="item.fieldClass == ''"
+              :prop="item.field"
+              :label="item.label"
+              min-width="320"
+            >
+            </el-table-column>
+            <el-table-column
+              v-else
+              :prop="item.field"
+              :label="item.label"
+              config=""
+              min-width="220"
+            >
+              <template v-if="item.help" #header="scope">
+                {{ scope.column.label }}
+                <tooltip :content="item.help" />
+              </template>
 
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="重新申请"
-								placement="top-end"
-							>
-								<el-button type="warning" size="small" class="fa fa-retweet"   />
-							</el-tooltip>
-							<el-tooltip
-								class="box-item"
-								effect="dark"
-								content="查看详情"
-								placement="top-end"
-							>
-								<el-button type="primary" size="small" class="fa fa-eye"  />
-							</el-tooltip>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="撤回"
-								placement="top-end"
-							>
-								<el-button  size="small" class="fa fa-reply-all"  />
-							</el-tooltip>
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="删除"
-								placement="top-end"
-							>
-								<el-button type="danger" size="small" class="fa fa-trash-o"  />
-							</el-tooltip>
+              <template v-if="item.fieldClass == 'select'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == ''" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                <el-tag v-if="scope.row[scope.column.property] == 1" type="success"
+                  >启用</el-tag
+                >
+                <el-tag v-if="scope.row[scope.column.property] == 2" type="danger"
+                  >已禁用</el-tag
+                >
+                <el-tag v-if="scope.row[scope.column.property] == 3" type="info"
+                  >已删除</el-tag
+                >
+              </template>
+              <template v-if="item.fieldClass == 'deptOrg'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'owner'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}}拥有者 -->
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'lowcodeImage'" #default="scope">
+                <el-image
+                  style="width: 30px; height: 30px"
+                  :src="scope.row[scope.column.property]"
+                  :fit="fit"
+                />
+              </template>
+              <template v-if="item.fieldClass == 'expand-user'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+                <!--选择用户-->
+              </template>
+              <template v-if="item.fieldClass == 'radio'" #default="scope">
+                <!-- {{scope.row[scope.column.property]}}{{item}} -->
+                {{ judjeRadio(scope.row[scope.column.property], item.options) }}
+              </template>
+              <template v-if="item.fieldClass == 'upload'" #default="scope">
+                <div class="demo-image__error">
+                  <el-image
+                    style="width: 30px; height: 30px"
+                    :src="scope.row[scope.column.property]"
+                  >
+                    <template #error>
+                      <div class="image-slot">
+                        <el-icon><Picture /></el-icon>
+                      </div>
+                    </template>
+                  </el-image>
+                </div>
+              </template>
+              <template v-if="item.fieldClass == 'switch'" #default="scope">
+                <el-tag
+                  v-if="judjeSwitch(scope.row[scope.column.property], item.activeValue)"
+                  type="success"
+                  effect="light"
+                >
+                  启用
+                </el-tag>
+                <el-tag v-else type="danger" effect="light"> 禁用 </el-tag>
+              </template>
+              <template v-if="item.fieldClass == 'baidumap'" #default="scope">
+                {{ scope.row[scope.column.property] }}
+              </template>
+              <template v-if="item.fieldClass == 'associatedForms'" #default="scope">
+                <el-link
+                  key="primary"
+                  type="primary"
+                  @click="showAsfDetailDialog(item, scope, asfQueryParams)"
+                >
+                  {{ scope.row[scope.column.property] }}
+                </el-link>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+      </el-col>
+      <el-col v-if="viewType == 1 && state.total > 0" :span="24">
+        <div class="pageBox">
+          <el-pagination
+            v-model:currentPage="state.currentPage"
+            v-model:page-size="state.pageSize"
+            :page-sizes="[20, 30, 40, 50] as any"
+            :total="state.total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div>
+      </el-col>
+      <el-col v-if="viewType == 2" :span="24">
+        <CalendarPage
+          ref="calendarPageRef"
+          :search-send="searchSend"
+          :body-hight="265"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.card"
+        />
+      </el-col>
+      <el-col v-if="viewType == 3" :span="24">
+        <TimeAxisPage
+          ref="timeAxisRef"
+          :data="tableDataList"
+          :view-layout="viewLayout"
+          :columns-filter="columnsFilter"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.time"
+        />
+      </el-col>
+      <el-col v-if="viewType == 4" :span="24">
+        <GanttPage
+          ref="ganttPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.gantt"
+        />
+      </el-col>
+      <el-col v-if="viewType == 5" :span="24">
+        <MapPage
+          ref="mapPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.map"
+        />
+      </el-col>
+      <el-col v-if="viewType == 6" :span="24">
+        <CardPage
+          ref="cardPageRef"
+          :search-send="searchSend"
+          :drawer-with="drawerWith"
+          :view-setup="viewPage.card"
+          :columns-filter="columnsFilter"
+        />
+      </el-col>
+      <el-col :span="24" style="display: none">
+        {{ tableDataList }}
+      </el-col>
+      <el-col :span="24" style="display: none">
+        <el-button-group>
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="提交审批"
+            placement="top-end"
+          >
+            <el-button type="success" size="small" class="fa fa-send-o" />
+          </el-tooltip>
 
-							<el-tooltip
-								
-								class="box-item"
-								effect="dark"
-								content="申请修改"
-								placement="top-end"
-							>
-								<el-button type="info" size="small" class="fa fa-edit"  />
-							</el-tooltip>
-				</el-button-group>
-			
-			
-			</el-col>
-		</el-row>
-		<FormPageCont v-model:is-show="lookPageInfoIsShow" :drawer-with="drawerWith" :page-info="pageInfoCont" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
-		<FormPageCont v-model:is-show="asflookPageInfoIsShow" :drawer-with="drawerWith" :page-info="currentAsfTableDataList[0]" :table-page-class="tablePageClass" :oper-state="operState" @getPageData="getPageData" />
-		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="props.versionid" :versiontitle="props.versiontitle" :drawerwith="drawerWith" @searchquery="getListData" />
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="重新申请"
+            placement="top-end"
+          >
+            <el-button type="warning" size="small" class="fa fa-retweet" />
+          </el-tooltip>
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="查看详情"
+            placement="top-end"
+          >
+            <el-button type="primary" size="small" class="fa fa-eye" />
+          </el-tooltip>
+          <el-tooltip class="box-item" effect="dark" content="撤回" placement="top-end">
+            <el-button size="small" class="fa fa-reply-all" />
+          </el-tooltip>
+          <el-tooltip class="box-item" effect="dark" content="删除" placement="top-end">
+            <el-button type="danger" size="small" class="fa fa-trash-o" />
+          </el-tooltip>
 
+          <el-tooltip
+            class="box-item"
+            effect="dark"
+            content="申请修改"
+            placement="top-end"
+          >
+            <el-button type="info" size="small" class="fa fa-edit" />
+          </el-tooltip>
+        </el-button-group>
+      </el-col>
+    </el-row>
+    <FormPageCont
+      v-model:is-show="lookPageInfoIsShow"
+      :drawer-with="drawerWith"
+      :page-info="pageInfoCont"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      @getPageData="getPageData"
+    />
+    <FormPageCont
+      v-model:is-show="asflookPageInfoIsShow"
+      :drawer-with="drawerWith"
+      :page-info="currentAsfTableDataList[0]"
+      :table-page-class="tablePageClass"
+      :oper-state="operState"
+      @getPageData="getPageData"
+    />
+    <TableFlow
+      v-model:isopen="openTaskDrawer"
+      :versionid="props.versionid"
+      :versiontitle="props.versiontitle"
+      :drawerwith="drawerWith"
+      @searchquery="getListData"
+    />
 
-		<el-dialog v-model="asfShowDetailsFlag" title="关联表单详情查看" top="20px" style="margin-top:70px,margin-left:270px">
-                
-        </el-dialog>
-	
-	</div>
+    <el-dialog
+      v-model="asfShowDetailsFlag"
+      title="关联表单详情查看"
+      top="20px"
+      style="margin-top:70px,margin-left:270px"
+    >
+    </el-dialog>
+  </div>
 </template>
-<style  lang='scss' scoped>
-.rowBox{
-	width:100%;
+<style lang="scss" scoped>
+.rowBox {
+  width: 100%;
 }
-.table-list-comm{
-	padding:0px 15px 15px 15px;
+.table-list-comm {
+  padding: 0px 15px 15px 15px;
 }
-.seacherForm{
-	min-height: auto;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
+.seacherForm {
+  min-height: auto;
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-start;
 }
-.pageBox{
-	width:100%;
-	margin-top:20px;
-	text-align: center;
-	display: flex;
-  	justify-content: center;
+.pageBox {
+  width: 100%;
+  margin-top: 20px;
+  text-align: center;
+  display: flex;
+  justify-content: center;
 }
-.operateButArea{
-		width: 100%;
-		display: flex;
-		align-items: center;
-  		justify-content: space-between;
-		margin-top:15px;
-		margin-bottom:15px;
-		.operatLeft{
-			padding-bottom: 2px;
-		}
+.operateButArea {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 15px;
+  margin-bottom: 15px;
+  .operatLeft {
+    padding-bottom: 2px;
+  }
 }
-.group{
-	width: auto;
-    margin-right: 10px;
+.group {
+  width: auto;
+  margin-right: 10px;
 }
 .demo-image__error .block {
   padding: 0px 0;
diff --git a/src/views/sysworkflow/lowcodepage/appCardPage.vue b/src/views/sysworkflow/lowcodepage/appCardPage.vue
index 2cbc809..733b50e 100644
--- a/src/views/sysworkflow/lowcodepage/appCardPage.vue
+++ b/src/views/sysworkflow/lowcodepage/appCardPage.vue
@@ -3,471 +3,521 @@
 @ 时间: 2024-07-22 08:53:50
 @ 备注: 自定义应用卡片视图
 -->
-<script lang='ts' setup>
-import { json2string,objToStringify,string2json,stringToObj } from '@/utils/DesignForm/form'
+<script lang="ts" setup>
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
 import { customerFormCont } from "@/api/DesignForm/type";
-import { getCustomerFormList,editProductionFormStatus,appJwtPower,getFieldRecord } from '@/api/DesignForm/requestapi'
+import {
+  getCustomerFormList,
+  editProductionFormStatus,
+  appJwtPower,
+  getFieldRecord,
+} from "@/api/DesignForm/requestapi";
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 11:30:11
 @ 功能: 引入组件
 */
-import AppContainer from '@/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue'
-import AppContainerPage  from '@/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue' //自建应用编辑
-import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
-import TableFlow from '@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue'
+import AppContainer from "@/views/sysworkflow/lowcodepage/newLowCode/appLayout/appContainer.vue";
+import AppContainerPage from "@/views/sysworkflow/lowcodepage/newLowCode/appLayoutEdit/appContainerPage.vue"; //自建应用编辑
+import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue";
+import TableFlow from "@/views/sysworkflow/lowcodepage/pageFlow/tableFlow.vue";
 
 const props = defineProps({
-	searchQuery:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	appGroup:{
-		type:String,
-		default:""
-	},
-	drawerWith:{
-		type:Number,
-		default:true
-	}
+  searchQuery: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  appGroup: {
+    type: String,
+    default: "",
+  },
+  drawerWith: {
+    type: Number,
+    default: true,
+  },
 });
 
 const emits = defineEmits(["getRongQiAttr"]);
-const openTaskDrawer = ref(false) //新增任务
+const openTaskDrawer = ref(false); //新增任务
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:09:29
 @ 功能: 总记录数
 */
-const pageTotal = ref(0)
-const contList = ref<customerFormCont[]>()	//记录
-const loadingApp = ref(false)
-const runIsOpen = ref(false)
-const pickAppInfo = ref<customerFormCont>()			//应用或表单内容
+const pageTotal = ref(0);
+const contList = ref<customerFormCont[]>(); //记录
+const loadingApp = ref(false);
+const runIsOpen = ref(false);
+const pickAppInfo = ref<customerFormCont>(); //应用或表单内容
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 10:54:23
 @ 功能: 获取表单列表
 */
-const getFormAppList = (val:any) => {
-	loadingApp.value = true
-	let sendInfo = {
-		page:val.page,
-		pagesize:val.pagesize,
-		keywords:val.searchWork,
-		groupId:props.appGroup
-	}
-	getCustomerFormList(sendInfo)
-		.then(({ data }) => {
-			// console.log("打开应用-->",data);
-			pageTotal.value = data.total
-			contList.value = data.list
-		})
-		.finally(() => {
-			loadingApp.value = false
-		})
-}
+const getFormAppList = (val: any) => {
+  loadingApp.value = true;
+  let sendInfo = {
+    page: val.page,
+    pagesize: val.pagesize,
+    keywords: val.searchWork,
+    groupId: props.appGroup,
+  };
+  getCustomerFormList(sendInfo)
+    .then(({ data }) => {
+      // console.log("打开应用-->",data);
+      pageTotal.value = data.total;
+      contList.value = data.list;
+    })
+    .finally(() => {
+      loadingApp.value = false;
+    });
+};
 
 onMounted(() => {
-	nextTick(() => {
-		getFormAppList(props.searchQuery);
-	})
-})
-watch(()=>props.appGroup,()=>{
-	getFormAppList(props.searchQuery);
-})
-const srcList = (val:string) =>{
-	if(val){
-		return [val]
-	}else{
-		return ["https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png"]
-	}
-}
+  nextTick(() => {
+    getFormAppList(props.searchQuery);
+  });
+});
+watch(
+  () => props.appGroup,
+  () => {
+    getFormAppList(props.searchQuery);
+  }
+);
+const srcList = (val: string) => {
+  if (val) {
+    return [val];
+  } else {
+    return [
+      "https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png",
+    ];
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:57:45
 @ 功能: 编辑应用
 */
-const editIsOpen = ref(false)
-const appKey = ref<string>("")
-const editForm = (val:any) => {
-	emits("getRongQiAttr")
-	pickAppInfo.value = val
-	editIsOpen.value = true;
-}
+const editIsOpen = ref(false);
+const appKey = ref<string>("");
+const editForm = (val: any) => {
+  emits("getRongQiAttr");
+  pickAppInfo.value = val;
+  editIsOpen.value = true;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 09:58:19
 @ 功能: 编辑应用状态
 */
-const eidtStatus = (val:any) => {
-	emits("getRongQiAttr")
-	ElMessageBox.confirm(
-		'请问是否真的删除？删除后数据将无法找回！',
-		'温馨提示！',
-		{
-			confirmButtonText: '删除',
-			cancelButtonText: '取消',
-			type: 'warning',
-			draggable: true,
-		}
-	)
-	.then(() => {
-		editProductionFormStatus({id:[val.id.toString()],status:3,is_delete:false})
-			.then(({data})=>{
-				getFormAppList(props.searchQuery);
-			})
-	})
-	.catch(() => {
-		getFormAppList(props.searchQuery);
-	})
-}
+const eidtStatus = (val: any) => {
+  emits("getRongQiAttr");
+  ElMessageBox.confirm("请问是否真的删除？删除后数据将无法找回！", "温馨提示！", {
+    confirmButtonText: "删除",
+    cancelButtonText: "取消",
+    type: "warning",
+    draggable: true,
+  })
+    .then(() => {
+      editProductionFormStatus({
+        id: [val.id.toString()],
+        status: 3,
+        is_delete: false,
+      }).then(({ data }) => {
+        getFormAppList(props.searchQuery);
+      });
+    })
+    .catch(() => {
+      getFormAppList(props.searchQuery);
+    });
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 10:01:17
 @ 功能: 打开应用
 */
-const openApp = (val:any) => {
-	emits("getRongQiAttr")
-	pickAppInfo.value = val
-	appJwtPower({id:val.signCodeStr,types:1})
-		.then(({data})=>{
-			// console.log("打开应用------>data:",data)
-			if(data){
-				runIsOpen.value = true
-			}else{
-				ElMessage({
-					message: '对不起！您不可使用此App！请联系管理员进行授权！',
-					type: 'error',
-					plain: true,
-				})
-			}
-		})
-}
+const openApp = (val: any) => {
+  emits("getRongQiAttr");
+  pickAppInfo.value = val;
+  appJwtPower({ id: val.signCodeStr, types: 1 }).then(({ data }) => {
+    // console.log("打开应用------>data:",data)
+    if (data) {
+      runIsOpen.value = true;
+    } else {
+      ElMessage({
+        message: "对不起！您不可使用此App！请联系管理员进行授权！",
+        type: "error",
+        plain: true,
+      });
+    }
+  });
+};
 defineExpose({
-	getFormAppList
-})
+  getFormAppList,
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-23 15:27:51
 @ 功能: 表单数据
 */
 const state = reactive({
-    tableData: {
-      // tableProps: {}, //表格所有参数
-      columns: [],
-      config: {},
-	  controlBtn:[],
-	  operateBtn:[]
+  tableData: {
+    // tableProps: {}, //表格所有参数
+    columns: [],
+    config: {},
+    controlBtn: [],
+    operateBtn: [],
+  },
+  searchData: [],
+  loading: false,
+  attrObj: {},
+  config: {
+    pageSize: 10,
+    searchIsShow: true,
+    searchFormIsShow: true,
+    openPageMode: "drawer",
+  },
+  tagList: {},
+  formId: props.formKey || "",
+  formList: [], // 所有可选表单数据源
+  name: "",
+  treeData: {}, // 左侧树相关
+  previewVisible: false,
+  tabsName: "second",
+  formFieldList: [], // 表单数据源所有可选字段
+  formApi: {
+    type: "1",
+    addApiUrl: "",
+    editApiUrl: "",
+    delApiUrl: "",
+    lookApiUrl: "",
+  },
+  dict: {},
+  refreshTable: true,
+  view: {
+    list: {
+      status: true,
+      isClick: false,
+      form: {
+        sortWord: "",
+        sortClass: 1,
+        title: [],
+      },
+    },
+    date: {
+      status: false,
+      isClick: false,
+      form: {
+        startTime: "",
+        endTime: "",
+        dayType: 1,
+        title: [],
+      },
+    },
+    time: {
+      status: false,
+      isClick: false,
+      form: {
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
+    },
+    gantt: {
+      status: false,
+      isClick: false,
+      form: {
+        startTime: "",
+        endTime: "",
+        dayType: 2,
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
     },
-    searchData: [],
-    loading: false,
-    attrObj: {},
-    config: {
-		pageSize:10,
-		searchIsShow:true,
-		searchFormIsShow:true,
-		openPageMode:"drawer"
-	},
-    tagList: {},
-    formId: props.formKey || '',
-    formList: [], // 所有可选表单数据源
-    name: '',
-    treeData: {}, // 左侧树相关
-    previewVisible: false,
-    tabsName: 'second',
-    formFieldList: [], // 表单数据源所有可选字段
-	formApi:{
-		type:"1",
-		addApiUrl:"",
-		editApiUrl:"",
-		delApiUrl:"",
-		lookApiUrl:""
-	},
-    dict: {},
-    refreshTable: true,
-	view:{
-		list:{
-			status:true,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sortClass:1,
-				title:[]
-			}
-		},
-		date:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:1,
-				title:[]
-			}
-		}
-		,
-		time:{
-			status:false,
-			isClick:false,
-			form:{
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		gantt:{
-			status:false,
-			isClick:false,
-			form:{
-				startTime:"",
-				endTime:"",
-				dayType:2,
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		}
-		,
-		map:{
-			status:false,
-			isClick:false,
-			form:{
-				mapWord:"",
-				sortWord:"",
-				sort:1,
-				title:[]
-			}
-		},
-		card:{
-			status:false,
-			isClick:false,
-			form:{
-				sort:1,
-				sortWord:"",
-				imgWork:"",
-				imgWidth:50,
-				imgHeight:50,
-				imgBorderRadius:5,
-				imgPadding:2,
-				titleWork:"",
-				describe:"",
-				ranks:3,
-				title:[]
-			}
-		}
-	}
-})
-const lookPageIsShow = ref(false)
-const versionTitle = ref<string>("")	//表单名称
-const versionId = ref<string>("")	//表单版本号
-const formId = ref<string>("")
-const addFormIsShow = ref(false)
+    map: {
+      status: false,
+      isClick: false,
+      form: {
+        mapWord: "",
+        sortWord: "",
+        sort: 1,
+        title: [],
+      },
+    },
+    card: {
+      status: false,
+      isClick: false,
+      form: {
+        sort: 1,
+        sortWord: "",
+        imgWork: "",
+        imgWidth: 50,
+        imgHeight: 50,
+        imgBorderRadius: 5,
+        imgPadding: 2,
+        titleWork: "",
+        describe: "",
+        ranks: 3,
+        title: [],
+      },
+    },
+  },
+});
+const lookPageIsShow = ref(false);
+const versionTitle = ref<string>(""); //表单名称
+const versionId = ref<string>(""); //表单版本号
+const formId = ref<string>("");
+const addFormIsShow = ref(false);
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:32:18
 @ 功能: 查看表单列表
 */
-const lookFormList = (val:any) => {
-	emits('getRongQiAttr')
-	// console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
-	
+const lookFormList = (val: any) => {
+  emits("getRongQiAttr");
+  // console.log("查看表单列表aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", val)
 
-	versionId.value = val.versionId
-	versionTitle.value = val.name
+  versionId.value = val.versionId;
+  versionTitle.value = val.name;
 
-	if(val.listjson != "" && val.listjson != null){
-			lookPageIsShow.value = true
-			state.formId = val.idStr
-			let stateData = string2json(val.listjson)
-			// console.log(val.listjson)
-			// console.log("查看表单列表---->",stateData)
-			//let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
-			if(stateData.tableData.columns&&stateData.tableData.columns.length>0){
-				for(let i = 0;i<stateData.tableData.columns.length;i++){
-					if(stateData.tableData.columns[i].config!=undefined && stateData.tableData.columns[i].control!=undefined){
-						// console.log(stateData.tableData.columns[i])
-						let paramx:string = ""+stateData.tableData.columns[i].control.optionsValue3Field
-						/*
+  if (val.listjson != "" && val.listjson != null) {
+    lookPageIsShow.value = true;
+    state.formId = val.idStr;
+    let stateData = string2json(val.listjson);
+    // console.log(val.listjson)
+    // console.log("查看表单列表---->",stateData)
+    //let holeControlAndConfigStateData = string2json(data.data.appForm.mastesformjson)
+    if (stateData.tableData.columns && stateData.tableData.columns.length > 0) {
+      for (let i = 0; i < stateData.tableData.columns.length; i++) {
+        if (
+          stateData.tableData.columns[i].config != undefined &&
+          stateData.tableData.columns[i].control != undefined
+        ) {
+          // console.log(stateData.tableData.columns[i])
+          let paramx: string =
+            "" + stateData.tableData.columns[i].control.optionsValue3Field;
+          /*
 							在这里请求后台获取字段
 						*/
-						console.log("addCardPage---298",paramx)
-						if(paramx && paramx != "" && paramx != null && paramx != "undefined"){
-							getFieldRecord(paramx).then(({ data }) => {
-								stateData.tableData.columns[i].options = data
-								if(stateData.searchData.length>0){
-									for(let j = 0;j<stateData.searchData.length;j++){
-										// console.log(stateData.searchData[j])
-										if(stateData.searchData[j].id==stateData.tableData.columns[i].id){
-											stateData.searchData[j].options = data
-										}
-									}
-								}
-							})
-						}
-					}
-				}
-			}
-			state.tableData = stateData.tableData
-			state.searchData = stateData.searchData
-			state.loading = stateData.loading
-			state.attrObj = stateData.attrObj
-			state.config = stateData.config
-			state.tagList = stateData.tagList
-			
-			state.formList = stateData.formList
-			state.name = stateData.name
-			state.treeData = stateData.treeData
-			state.previewVisible = stateData.previewVisible
-			state.formFieldList = stateData.formFieldList
-			state.formApi = stateData.formApi
-			state.dict = stateData.dict
-			state.refreshTable = stateData.refreshTable
-	}else{
-		openTaskDrawer.value = true
-	}
+          console.log("addCardPage---298", paramx);
+          if (paramx && paramx != "" && paramx != null && paramx != "undefined") {
+            getFieldRecord(paramx).then(({ data }) => {
+              stateData.tableData.columns[i].options = data;
+              if (stateData.searchData.length > 0) {
+                for (let j = 0; j < stateData.searchData.length; j++) {
+                  // console.log(stateData.searchData[j])
+                  if (stateData.searchData[j].id == stateData.tableData.columns[i].id) {
+                    stateData.searchData[j].options = data;
+                  }
+                }
+              }
+            });
+          }
+        }
+      }
+    }
+    state.tableData = stateData.tableData;
+    state.searchData = stateData.searchData;
+    state.loading = stateData.loading;
+    state.attrObj = stateData.attrObj;
+    state.config = stateData.config;
+    state.tagList = stateData.tagList;
 
-
-	
-
-
-}
+    state.formList = stateData.formList;
+    state.name = stateData.name;
+    state.treeData = stateData.treeData;
+    state.previewVisible = stateData.previewVisible;
+    state.formFieldList = stateData.formFieldList;
+    state.formApi = stateData.formApi;
+    state.dict = stateData.dict;
+    state.refreshTable = stateData.refreshTable;
+  } else {
+    openTaskDrawer.value = true;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 10:57:11
 @ 功能: 编辑表单
 */
-const editFormApp = (val:any) => {
-	emits('getRongQiAttr')
-	formId.value = val.id.toString()
-	addFormIsShow.value= true
-	// console.log("编辑表单",val.id,"-",formId.value,"-",addFormIsShow.value)
-}
+const editFormApp = (val: any) => {
+  emits("getRongQiAttr");
+  formId.value = val.id.toString();
+  addFormIsShow.value = true;
+  // console.log("编辑表单",val.id,"-",formId.value,"-",addFormIsShow.value)
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 09:06:44
 @ 功能: 刷新页面
 */
-const refreshPage = (pageType:string) =>{
-	addFormIsShow.value = false;
-	getFormAppList(props.searchQuery);
-}
+const refreshPage = (pageType: string) => {
+  addFormIsShow.value = false;
+  getFormAppList(props.searchQuery);
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-08-09 11:28:39
 @ 功能: 翻页
 */
-const handleCurrentChange = (val:any) =>{
-	// console.log("翻页",val)
-	props.searchQuery.page = val
-	getFormAppList(props.searchQuery);
-}
+const handleCurrentChange = (val: any) => {
+  // console.log("翻页",val)
+  props.searchQuery.page = val;
+  getFormAppList(props.searchQuery);
+};
 </script>
 <template>
-	<div>
-		<div v-loading="loadingApp" class="content1 flex flex-wrap gap-4">
-			<el-card v-for="item in contList" :key="item.id" class="cardBox">
-				
-					<template #header>
-						<el-dropdown  v-if="item.classify==3">
-							<span class="el-dropdown-link">
-								<el-icon><MoreFilled /></el-icon>
-							</span>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="editForm(item)" >编辑</el-dropdown-item>
-									<el-dropdown-item @click="eidtStatus(item)" divided>删除</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-						<el-dropdown  v-else>
-							<span class="el-dropdown-link">
-								<el-icon><MoreFilled /></el-icon>
-							</span>
-							<template #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item @click="editFormApp(item)" >编辑</el-dropdown-item>
-									<el-dropdown-item @click="eidtStatus(item)" divided>删除</el-dropdown-item>
-								</el-dropdown-menu>
-							</template>
-						</el-dropdown>
-					</template>
-					<div  v-if="item.classify==3" class="cardContBox" @click="openApp(item)">
-						<el-image
-							style="width: 100px; height: 100px"
-							:src="item.icon?item.icon:'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'"
-							:zoom-rate="1.2"
-							:max-scale="7"
-							:min-scale="0.2"
-							:initial-index="4"
-							fit="cover"
-						/>
-						<div class="cardInfo" :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;' ">
-							<div class="title">{{item.name}}</div>
-							<div class="content">{{item.describe}}</div>
-						</div>
-					</div>
-					<div  v-else class="cardContBox" @click="lookFormList(item)">
-						<el-image
-							style="width: 100px; height: 100px"
-							:src="item.icon?item.icon:'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'"
-							:zoom-rate="1.2"
-							:max-scale="7"
-							:min-scale="0.2"
-							:initial-index="4"
-							fit="cover"
-						/>
-						<div class="cardInfo" :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;' ">
-							<div class="title">{{item.name}}</div>
-							<div class="content">{{item.describe}}</div>
-						</div>
-					</div>
-			</el-card>
-			
-		</div>
-		<div class="pagination-box">
-            <el-pagination background v-if="pageTotal > 0" v-model:current-page="props.searchQuery.page"
-            v-model:page-size="props.searchQuery.pagesize"
-            :total="pageTotal" @current-change="handleCurrentChange" />
+  <div>
+    <div v-loading="loadingApp" class="content1 flex flex-wrap gap-4">
+      <el-card v-for="item in contList" :key="item.id" class="cardBox">
+        <template #header>
+          <el-dropdown v-if="item.classify == 3">
+            <span class="el-dropdown-link">
+              <el-icon><MoreFilled /></el-icon>
+            </span>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="editForm(item)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="eidtStatus(item)" divided
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+          <el-dropdown v-else>
+            <span class="el-dropdown-link">
+              <el-icon><MoreFilled /></el-icon>
+            </span>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="editFormApp(item)">编辑</el-dropdown-item>
+                <el-dropdown-item @click="eidtStatus(item)" divided
+                  >删除</el-dropdown-item
+                >
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </template>
+        <div v-if="item.classify == 3" class="cardContBox" @click="openApp(item)">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="
+              item.icon
+                ? item.icon
+                : 'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'
+            "
+            :zoom-rate="1.2"
+            :max-scale="7"
+            :min-scale="0.2"
+            :initial-index="4"
+            fit="cover"
+          />
+          <div
+            class="cardInfo"
+            :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;'"
+          >
+            <div class="title">{{ item.name }}</div>
+            <div class="content">{{ item.describe }}</div>
+          </div>
         </div>
-		<AppContainer v-model:run-is-open="runIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" @refreshPage="getFormAppList" />
-		<AppContainerPage v-model:edit-is-open="editIsOpen" :pick-app-info="pickAppInfo" :drawer-with="props.drawerWith" :search-query="props.searchQuery" :group-key="props.appGroup" @refreshPage="getFormAppList" />
-
-
-		<el-drawer
-			v-model="lookPageIsShow"
-			title="列表预览"
-			direction="rtl"
-			:before-close="handlePreviewClose"
-			:size="props.drawerWith"
-		>
-			<ak-page-list
-				:data="state.tableData"
-				:search-data="state.searchData"
-				:config="state.config"
-				:form-id="state.formId"
-				:versionid="versionId" 
-				:viewPage="state.view"
-				:versiontitle="versionTitle"
-				
-				v-model:look-page-is-show="lookPageIsShow"
-			/>
-		</el-drawer>
-		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="props.drawerWith" v-model:form-key="formId" @refreshPage="refreshPage" />
+        <div v-else class="cardContBox" @click="lookFormList(item)">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="
+              item.icon
+                ? item.icon
+                : 'https://docu.hxgk.group/images/2024_04/482167d1bf2b75a5717bcf68e18235f7.png'
+            "
+            :zoom-rate="1.2"
+            :max-scale="7"
+            :min-scale="0.2"
+            :initial-index="4"
+            fit="cover"
+          />
+          <div
+            class="cardInfo"
+            :style="'width: calc(100% - 100px); height: 100px; overflow: hidden;'"
+          >
+            <div class="title">{{ item.name }}</div>
+            <div class="content">{{ item.describe }}</div>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <div class="pagination-box">
+      <el-pagination
+        background
+        v-if="pageTotal > 0"
+        v-model:current-page="props.searchQuery.page"
+        v-model:page-size="props.searchQuery.pagesize"
+        :total="pageTotal"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+    <AppContainer
+      v-model:run-is-open="runIsOpen"
+      :pick-app-info="pickAppInfo"
+      :drawer-with="props.drawerWith"
+      :search-query="props.searchQuery"
+      @refreshPage="getFormAppList"
+    />
+    <AppContainerPage
+      v-model:edit-is-open="editIsOpen"
+      :pick-app-info="pickAppInfo"
+      :drawer-with="props.drawerWith"
+      :search-query="props.searchQuery"
+      :group-key="props.appGroup"
+      @refreshPage="getFormAppList"
+    />
 
+    <el-drawer
+      v-model="lookPageIsShow"
+      title="列表预览"
+      direction="rtl"
+      :before-close="handlePreviewClose"
+      :size="props.drawerWith"
+    >
+      <ak-page-list
+        :data="state.tableData"
+        :search-data="state.searchData"
+        :config="state.config"
+        :form-id="state.formId"
+        :versionid="versionId"
+        :viewPage="state.view"
+        :versiontitle="versionTitle"
+        v-model:look-page-is-show="lookPageIsShow"
+      />
+    </el-drawer>
+    <LowCodeFormPage
+      v-if="addFormIsShow"
+      :drawer-with="props.drawerWith"
+      v-model:form-key="formId"
+      @refreshPage="refreshPage"
+    />
 
-		<TableFlow  v-model:isopen="openTaskDrawer" :versionid="versionId" :versiontitle="versionTitle" :drawerwith="props.drawerWith" @searchquery="getFormAppList" />
-	</div>
+    <TableFlow
+      v-model:isopen="openTaskDrawer"
+      :versionid="versionId"
+      :versiontitle="versionTitle"
+      :drawerwith="props.drawerWith"
+      @searchquery="getFormAppList"
+    />
+  </div>
 </template>
-<style  lang='scss' scoped>
-.pagination-box{
-    display: flex;
-    justify-content: center;
-    margin-top: 15px;
+<style lang="scss" scoped>
+.pagination-box {
+  display: flex;
+  justify-content: center;
+  margin-top: 15px;
 }
 .el-row:last-child {
   margin-bottom: 0;
@@ -483,47 +533,46 @@ const handleCurrentChange = (val:any) =>{
   background-color: #eeeeee;
 }
 
-
-.content1{
-	padding:1rem 1rem 0 1rem;
-	::v-deep .el-card__body{
-		padding:5px 10px 10px 10px;
-	}
-	::v-deep .el-card__header{
-		border-bottom: 0;
-		padding: 0;
-		height: 10px;
-		display:flex;
-		justify-content: right;
-	}
-	.el-dropdown-link{
-		margin-top: 4px;
-		margin-right: 10px;
-		cursor: pointer;
-	}
+.content1 {
+  padding: 1rem 1rem 0 1rem;
+  ::v-deep .el-card__body {
+    padding: 5px 10px 10px 10px;
+  }
+  ::v-deep .el-card__header {
+    border-bottom: 0;
+    padding: 0;
+    height: 10px;
+    display: flex;
+    justify-content: right;
+  }
+  .el-dropdown-link {
+    margin-top: 4px;
+    margin-right: 10px;
+    cursor: pointer;
+  }
 }
-.cardBox{
-	width:306px;
-	.cardContBox{
-		display: flex;
-		width: 100%;
-		justify-content: flex-start;
-		cursor: pointer;
-	}
-	.cardInfo{
-		padding-left: 5px;
-	}
-	.title{
-		font-size:14px;
-		font-weight:bold;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-	.content{
-		color: #909399;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
+.cardBox {
+  width: 306px;
+  .cardContBox {
+    display: flex;
+    width: 100%;
+    justify-content: flex-start;
+    cursor: pointer;
+  }
+  .cardInfo {
+    padding-left: 5px;
+  }
+  .title {
+    font-size: 14px;
+    font-weight: bold;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .content {
+    color: #909399;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 </style>
diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue
index cb12317..7e8b50c 100644
--- a/src/views/sysworkflow/lowcodepage/index.vue
+++ b/src/views/sysworkflow/lowcodepage/index.vue
@@ -3,201 +3,198 @@
 @ 时间: 2024-07-20 15:31:12
 @ 备注: 应用设置
 -->
-<script lang='ts' setup>
-import { SearchForm,customerFormCont,customerFormConfig } from "@/api/DesignForm/type";
-import { customerFormGroupList,editFormGroupState,createApp,gainAppEditPsge } from '@/api/DesignForm/requestapi'
+<script lang="ts" setup>
+import { SearchForm, customerFormCont, customerFormConfig } from "@/api/DesignForm/type";
+import {
+  customerFormGroupList,
+  editFormGroupState,
+  createApp,
+  gainAppEditPsge,
+} from "@/api/DesignForm/requestapi";
 
-import { Search } from '@element-plus/icons-vue'
+import { Search } from "@element-plus/icons-vue";
 
 //引入页面
-import AppCardPage from "@/views/sysworkflow/lowcodepage/appCardPage.vue"
-import AppListPage from "@/views/sysworkflow/lowcodepage/appListPage.vue"
-import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue"
-import LowCodeFormGroupPage from "@/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue"
-import DesignAPPpage from "@/views/sysworkflow/lowcodepage/appPage/index.vue"	//自建应用
+import AppCardPage from "@/views/sysworkflow/lowcodepage/appCardPage.vue";
+import AppListPage from "@/views/sysworkflow/lowcodepage/appListPage.vue";
+import LowCodeFormPage from "@/views/sysworkflow/lowcodepage/lowCodeFormPage.vue";
+import LowCodeFormGroupPage from "@/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue";
+import DesignAPPpage from "@/views/sysworkflow/lowcodepage/appPage/index.vue"; //自建应用
 
-
-const contbody = ref()	//实例化内容容器
-const carPage = ref()
-const appListPage = ref()
-const appGroup = ref("1")
-const page = ref<number>(1)			//页码
-const pageSize = ref<number>(12000)	//每页显示几个
-const pageTotal = ref<number>(0)	//总记录数
-const groupFormList = ref<any[]>([]) //记录数组
-const drawerWith = ref();	//抽屉宽度
-const appPageShow = ref(false)
-const addFormGroupIsShow = ref(false)
-const formKey = ref<string>("") //表单标识
-const formGroupKey = ref<string>("") //表单标识
-const drawerGroupWith = ref();	//编辑表单时抽屉宽度
-const groupKey = ref<string>("") //分组标识
-const squareUrl = ref<string>('https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png')
+const contbody = ref(); //实例化内容容器
+const carPage = ref();
+const appListPage = ref();
+const appGroup = ref("1");
+const page = ref<number>(1); //页码
+const pageSize = ref<number>(12000); //每页显示几个
+const pageTotal = ref<number>(0); //总记录数
+const groupFormList = ref<any[]>([]); //记录数组
+const drawerWith = ref(); //抽屉宽度
+const appPageShow = ref(false);
+const addFormGroupIsShow = ref(false);
+const formKey = ref<string>(""); //表单标识
+const formGroupKey = ref<string>(""); //表单标识
+const drawerGroupWith = ref(); //编辑表单时抽屉宽度
+const groupKey = ref<string>(""); //分组标识
+const squareUrl = ref<string>(
+  "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png"
+);
 
 const searchQuery = reactive({
-	page:1,
-	pagesize:20,
-	searchWork:""
-})
-const isClick = ref(1)
+  page: 1,
+  pagesize: 20,
+  searchWork: "",
+});
+const isClick = ref(1);
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 09:30:27
 @ 功能: 获取表单分组
 */
-const isUpdate = ref(false)
+const isUpdate = ref(false);
 const gainFormGroup = () => {
-	let sendInfo = {
-		page:page.value,
-		pagesize:pageSize.value,
-		state:1
-	}
-	customerFormGroupList(sendInfo)
-		.then((data) =>{
-			
-			pageTotal.value = data.data.total
-			// pageTotal.value = 400
-			groupFormList.value = data.data.list
-			console.log("重新排序",groupFormList.value)
-			isUpdate.value = true
-			if(data.data.list&&data.data.list.length > 0){
-				let otherGroup = true
-				data.data.list.forEach((item,index)=>{
-					if(item.isTrue){
-						appGroup.value = item.idStr.toString()
-						otherGroup = false
-					}
-				})
-				if(otherGroup){
-					let lengNum = data.data.list.length
-					data.data.list.forEach((item,index)=>{
-						if(lengNum > 1){
-							if(index == 1){
-								appGroup.value = item.idStr.toString()
-							}
-						}else{
-							if(index == 0){
-								appGroup.value = item.idStr.toString()
-							}
-						}
-						
-					})
-				}
-			}	
-			nextTick(()=>{
-				searchSub()
-			})		
-		})
-		
-}
-const handleClick = (val:any) => {
-	// console.log("换挡",val,appGroup)
-}
+  let sendInfo = {
+    page: page.value,
+    pagesize: pageSize.value,
+    state: 1,
+  };
+  customerFormGroupList(sendInfo).then((data) => {
+    pageTotal.value = data.data.total;
+    // pageTotal.value = 400
+    groupFormList.value = data.data.list;
+    console.log("重新排序", groupFormList.value);
+    isUpdate.value = true;
+    if (data.data.list && data.data.list.length > 0) {
+      let otherGroup = true;
+      data.data.list.forEach((item, index) => {
+        if (item.isTrue) {
+          appGroup.value = item.idStr.toString();
+          otherGroup = false;
+        }
+      });
+      if (otherGroup) {
+        let lengNum = data.data.list.length;
+        data.data.list.forEach((item, index) => {
+          if (lengNum > 1) {
+            if (index == 1) {
+              appGroup.value = item.idStr.toString();
+            }
+          } else {
+            if (index == 0) {
+              appGroup.value = item.idStr.toString();
+            }
+          }
+        });
+      }
+    }
+    nextTick(() => {
+      searchSub();
+    });
+  });
+};
+const handleClick = (val: any) => {
+  // console.log("换挡",val,appGroup)
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 08:50:03
 @ 功能: 改变视图展示模式
 */
-const viewChannel = (val:number) =>{
-	isClick.value = val;
-}
+const viewChannel = (val: number) => {
+  isClick.value = val;
+};
 
-onMounted(()=>{
-	drawerWith.value = contbody.value?.clientWidth
-	gainFormGroup()
-})
+onMounted(() => {
+  drawerWith.value = contbody.value?.clientWidth;
+  gainFormGroup();
+});
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-20 16:19:45
 @ 功能: 获取表单数据
 */
-const handleCurrentChange = (val:any) => {}
+const handleCurrentChange = (val: any) => {};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-07-22 10:08:33
 @ 功能: 搜索
 */
-const searchSub = () =>{
-	if(isClick.value == 1){
-		carPage.value.getFormAppList(searchQuery)
-	}else{
-		appListPage.value.getFormAppList(searchQuery)
-	}
-}
+const searchSub = () => {
+  if (isClick.value == 1) {
+    carPage.value.getFormAppList(searchQuery);
+  } else {
+    appListPage.value.getFormAppList(searchQuery);
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-04-01 14:27:51
 @ 功能: 获取容器宽度
 */
 const getRongQiAttr = () => {
-	drawerWith.value = contbody.value?.clientWidth
-}
+  drawerWith.value = contbody.value?.clientWidth;
+};
 
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 09:06:32
 @ 功能: 选择添加项目
 */
-const handleCommand = (command: string,groupId: string) => {
-	// ElMessage(`click on item ${command}`)
-	if (command == "addForm"){
-		formKey.value = ""
-		formGroupKey.value = groupId
-		// addFormIsShow.value = true
-		drawerWith.value = contbody.value?.clientWidth
-		addFormIsShow.value = true;
-	}else if(command == "addFormApp"){	
-		
-		drawerWith.value = contbody.value?.clientWidth
-		let sendInfo = {
-			id:groupId.toString()
-		}
-		createApp(sendInfo)
-			.then((data)=>{
-				formKey.value = data.data.uuid
-				groupKey.value = groupId.toString()
-				nextTick(() =>{
-					appPageShow.value = true
-				});
-			})
-			.finally(() => {
-				
-			})
-		
-	}else{
-		groupKey.value = ""
-		addFormGroupIsShow.value = true
-		drawerGroupWith.value = 400
-	}
-}
+const handleCommand = (command: string, groupId: string) => {
+  // ElMessage(`click on item ${command}`)
+  if (command == "addForm") {
+    formKey.value = "";
+    formGroupKey.value = groupId;
+    // addFormIsShow.value = true
+    drawerWith.value = contbody.value?.clientWidth;
+    addFormIsShow.value = true;
+  } else if (command == "addFormApp") {
+    drawerWith.value = contbody.value?.clientWidth;
+    let sendInfo = {
+      id: groupId.toString(),
+    };
+    createApp(sendInfo)
+      .then((data) => {
+        formKey.value = data.data.uuid;
+        groupKey.value = groupId.toString();
+        nextTick(() => {
+          appPageShow.value = true;
+        });
+      })
+      .finally(() => {});
+  } else {
+    groupKey.value = "";
+    addFormGroupIsShow.value = true;
+    drawerGroupWith.value = 400;
+  }
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-21 13:53:29
 @ 功能: 编辑分组
 */
-const editFormGroup = (id: string) =>{
-	groupKey.value = id
-	addFormGroupIsShow.value = true
-	drawerGroupWith.value = 400
-}
+const editFormGroup = (id: string) => {
+  groupKey.value = id;
+  addFormGroupIsShow.value = true;
+  drawerGroupWith.value = 400;
+};
 /**
 @ 作者: 秦东
 @ 时间: 2024-03-09 09:06:44
 @ 功能: 刷新页面
 */
 
-const refreshPage = (pageType:string) =>{
-	if(pageType == "formPage"){
-		addFormIsShow.value = false;
-	}else{
-		addFormGroupIsShow.value = false;
-	}
-	console.log("刷新页面")
-	gainFormGroup()
-	
-}
+const refreshPage = (pageType: string) => {
+  if (pageType == "formPage") {
+    addFormIsShow.value = false;
+  } else {
+    addFormGroupIsShow.value = false;
+  }
+  console.log("刷新页面");
+  gainFormGroup();
+};
 
 /**
 @ 作者: 秦东
@@ -205,134 +202,188 @@ const refreshPage = (pageType:string) =>{
 @ 功能: 改变分组状态
 */
 const eidtGroupStatus = (id: string, state: number) => {
-
-	ElMessageBox.confirm(
-		'您确定要删除此分组吗？一经删除！数据将不可恢复！请慎重执行此操作！！！',
-		'温馨提示',
-		{
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning',
-		}
-	)
-	.then(() => {
-		let sendInfo = {
-			id: id.toString(),
-			status: state
-		}
-		editFormGroupState(sendInfo)
-			.then((data) =>{
-				ElMessageBox.alert(data.msg, '温馨提示！', {
-						confirmButtonText: '确定',
-						callback: (action: Action) => {
-							gainFormGroup()
-						}
-				});
-			})
-	})
-
-	
-}
+  ElMessageBox.confirm(
+    "您确定要删除此分组吗？一经删除！数据将不可恢复！请慎重执行此操作！！！",
+    "温馨提示",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning",
+    }
+  ).then(() => {
+    let sendInfo = {
+      id: id.toString(),
+      status: state,
+    };
+    editFormGroupState(sendInfo).then((data) => {
+      ElMessageBox.alert(data.msg, "温馨提示！", {
+        confirmButtonText: "确定",
+        callback: (action: Action) => {
+          gainFormGroup();
+        },
+      });
+    });
+  });
+};
 </script>
 <template>
-	<div ref="contbody" class="tab-box">
-		<el-tabs v-model="appGroup" :key="isUpdate" class="demo-tabs" @tab-click="handleClick">
-			<el-tab-pane v-for="item in groupFormList"  :label="item.title" :name="item.idStr"></el-tab-pane>
-			
-		</el-tabs>
+  <div ref="contbody" class="tab-box">
+    <el-tabs
+      v-model="appGroup"
+      :key="isUpdate"
+      class="demo-tabs"
+      @tab-click="handleClick"
+    >
+      <el-tab-pane
+        v-for="item in groupFormList"
+        :label="item.title"
+        :name="item.idStr"
+      ></el-tab-pane>
+    </el-tabs>
+
+    <div class="appSubButton">
+      <el-input
+        v-model="searchQuery.searchWork"
+        style="max-width: 150px; margin: 15px 10px 15px 0"
+        placeholder="请输入名称"
+        class="input-with-select"
+        clearable
+      >
+        <template #append>
+          <el-button :icon="Search" @click="searchSub()" />
+        </template>
+      </el-input>
+      <el-button-group class="butGroup">
+        <el-button
+          class="fa fa-object-group"
+          :color="isClick == 1 ? '#a0cfff' : ''"
+          @click="viewChannel(1)"
+        />
+        <el-button
+          class="fa fa-table"
+          :color="isClick != 1 ? '#a0cfff' : ''"
+          @click="viewChannel(2)"
+        />
 
-		<div class="appSubButton">
-			<el-input
-					v-model="searchQuery.searchWork"
-					style="max-width: 150px;margin: 15px 10px 15px 0;"
-					placeholder="请输入名称"
-					class="input-with-select"
-					clearable
-				>
-				<template #append>
-					<el-button :icon="Search" @click="searchSub()" />
-				</template>
-			</el-input>
-			<el-button-group class="butGroup">
-				<el-button class="fa fa-object-group"  :color="isClick==1?'#a0cfff':''"  @click="viewChannel(1)"   />
-				<el-button class="fa fa-table" :color="isClick!=1?'#a0cfff':''" @click="viewChannel(2)" />
-				
-				<el-dropdown>
-					<el-button class="fa fa-reorder leftLink" />
-					<template #dropdown>
-						<el-dropdown-item @click="handleCommand('addFormGroup',appGroup)" >新增分组</el-dropdown-item>
-						<el-dropdown-item @click="handleCommand('addForm',appGroup)" style="display:none" >添加表单</el-dropdown-item>
-						<el-dropdown-item @click="handleCommand('addFormApp',appGroup)" >添加应用</el-dropdown-item>
-						<el-dropdown-item @click="editFormGroup(appGroup)" divided>编辑</el-dropdown-item>
-						<el-dropdown-item @click="eidtGroupStatus(appGroup,3)">删除</el-dropdown-item>
-					</template>
-				</el-dropdown>
-			</el-button-group>
-		</div>
-	</div>
-	
-	<div class="app-container">
-        <AppCardPage ref="carPage" v-if="isClick==1" :app-group="appGroup" :search-query="searchQuery" :drawer-with="drawerWith" @getRongQiAttr="getRongQiAttr" />
-		<AppListPage ref="appListPage" v-else :app-group="appGroup" :search-query="searchQuery" :drawer-with="drawerWith" @getRongQiAttr="getRongQiAttr" />
-	</div>
-	<DesignAPPpage v-model:is-show="appPageShow"  :drawer-with="drawerWith" v-model:form-key="formKey" :group-key="groupKey" @refreshPage="refreshPage"  />
-			
-		<LowCodeFormPage v-if="addFormIsShow" :drawer-with="drawerWith" v-model:form-key="formKey" :form-group-key="formGroupKey" @refreshPage="refreshPage" />
-		<LowCodeFormGroupPage v-if="addFormGroupIsShow" :drawer-with="drawerGroupWith"  :group-key="groupKey" @refreshPage="refreshPage" />
+        <el-dropdown>
+          <el-button class="fa fa-reorder leftLink" />
+          <template #dropdown>
+            <el-dropdown-item @click="handleCommand('addFormGroup', appGroup)"
+              >新增分组</el-dropdown-item
+            >
+            <el-dropdown-item
+              @click="handleCommand('addForm', appGroup)"
+              style="display: none"
+              >添加表单</el-dropdown-item
+            >
+            <el-dropdown-item @click="handleCommand('addFormApp', appGroup)"
+              >添加应用</el-dropdown-item
+            >
+            <el-dropdown-item @click="editFormGroup(appGroup)" divided
+              >编辑</el-dropdown-item
+            >
+            <el-dropdown-item @click="eidtGroupStatus(appGroup, 3)"
+              >删除</el-dropdown-item
+            >
+          </template>
+        </el-dropdown>
+      </el-button-group>
+    </div>
+  </div>
+
+  <div class="app-container">
+    <AppCardPage
+      ref="carPage"
+      v-if="isClick == 1"
+      :app-group="appGroup"
+      :search-query="searchQuery"
+      :drawer-with="drawerWith"
+      @getRongQiAttr="getRongQiAttr"
+    />
+    <AppListPage
+      ref="appListPage"
+      v-else
+      :app-group="appGroup"
+      :search-query="searchQuery"
+      :drawer-with="drawerWith"
+      @getRongQiAttr="getRongQiAttr"
+    />
+  </div>
+  <DesignAPPpage
+    v-model:is-show="appPageShow"
+    :drawer-with="drawerWith"
+    v-model:form-key="formKey"
+    :group-key="groupKey"
+    @refreshPage="refreshPage"
+  />
+
+  <LowCodeFormPage
+    v-if="addFormIsShow"
+    :drawer-with="drawerWith"
+    v-model:form-key="formKey"
+    :form-group-key="formGroupKey"
+    @refreshPage="refreshPage"
+  />
+  <LowCodeFormGroupPage
+    v-if="addFormGroupIsShow"
+    :drawer-with="drawerGroupWith"
+    :group-key="groupKey"
+    @refreshPage="refreshPage"
+  />
 </template>
-<style  lang='scss' scoped>
+<style lang="scss" scoped>
 .app-container {
-    height: calc(100% - 125px);
-    width: calc(100% - 40px);
-	overflow: hidden;
-	overflow-y: auto;
-	padding-bottom:10px;
+  height: calc(100% - 125px);
+  width: calc(100% - 40px);
+  overflow: hidden;
+  overflow-y: auto;
+  padding-bottom: 10px;
 }
 
-.tab-box{
-    margin: 20px;
+.tab-box {
+  margin: 20px;
+  height: 63px;
+  background: #fff;
+  border-radius: 5px;
+  padding: 0 20px;
+  display: flex;
+  justify-content: space-between;
+  .appSubButton {
+    display: flex;
+    justify-content: space-between;
+    .butGroup {
+      margin-top: 15px;
+    }
+    .leftLink {
+      border-left: 1px solid #ccc;
+    }
+  }
+  ::v-deep(.el-tabs) {
+    height: 63px;
+    width: calc(100% - 300px);
+  }
+
+  ::v-deep(.el-tabs__nav) {
     height: 63px;
-    background: #fff;
-    border-radius: 5px;
-    padding: 0 20px;
-	display: flex;
-	justify-content: space-between;
-	.appSubButton{
-		display: flex;
-		justify-content: space-between;
-		.butGroup{
-			margin-top: 15px;
-		}
-		.leftLink{
-			border-left : 1px solid #ccc;
-		}
-	}
-	::v-deep(.el-tabs){
-		height: 63px;
-		width: calc(100% - 300px);
-	}
-	
-	::v-deep(.el-tabs__nav){
-		height: 63px;
-		font-size: 16px;
-	}
-	::v-deep(.el-tabs__item){
-		margin-top: 15px;
-		font-size: 16px;
-	}
-	::v-deep(.el-tabs__nav-prev){
-		line-height:0px;
-		margin-top:30px;
-	}
-	::v-deep(.el-tabs__nav-next){
-		line-height:0px;
-		margin-top:30px;
-	}
+    font-size: 16px;
+  }
+  ::v-deep(.el-tabs__item) {
+    margin-top: 15px;
+    font-size: 16px;
+  }
+  ::v-deep(.el-tabs__nav-prev) {
+    line-height: 0px;
+    margin-top: 30px;
+  }
+  ::v-deep(.el-tabs__nav-next) {
+    line-height: 0px;
+    margin-top: 30px;
+  }
 }
 
-.el-dropdown-link{
-	font-size:30px;
-	margin-top: 20px;
-	margin-left: 10px;
+.el-dropdown-link {
+  font-size: 30px;
+  margin-top: 20px;
+  margin-left: 10px;
 }
 </style>
diff --git a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
index 1fe83ec..498581a 100644
--- a/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
+++ b/src/views/taskplatform/taskmanagement/lookFlowInfoApp.vue
@@ -3,216 +3,268 @@
 @ 时间: 2024-06-17 15:30:36
 @ 备注: App执行任务
 -->
-<script lang='ts' setup>
-import { submitButton, afreshSubmitButton,editFormCont,draftSubmitButton,editLookFormCont } from "@/utils/workflow/const";
+<script lang="ts" setup>
 import {
-    json2string,
-    objToStringify,
-    string2json,
-    stringToObj
-} from '@/utils/DesignForm/form'
-
-import { haveCustomerFormVersion,generateFlow,gainTaskFormInfo,gainEditDataLog } from '@/api/taskapi/management'
+  submitButton,
+  afreshSubmitButton,
+  editFormCont,
+  draftSubmitButton,
+  editLookFormCont,
+} from "@/utils/workflow/const";
+import {
+  json2string,
+  objToStringify,
+  string2json,
+  stringToObj,
+} from "@/utils/DesignForm/form";
 
-import RunFlowStepApp from '@/views/taskplatform/taskmanagement/runFlowStepApp.vue'
+import {
+  haveCustomerFormVersion,
+  generateFlow,
+  gainTaskFormInfo,
+  gainEditDataLog,
+} from "@/api/taskapi/management";
 
-import { judgeSubmitCancel,startRunFlow,afreshRunFlow,onlyPublishFlow,gainEditFormFlowInfo } from '@/api/DesignForm/requestapi'
+import RunFlowStepApp from "@/views/taskplatform/taskmanagement/runFlowStepApp.vue";
 
+import {
+  judgeSubmitCancel,
+  startRunFlow,
+  afreshRunFlow,
+  onlyPublishFlow,
+  gainEditFormFlowInfo,
+} from "@/api/DesignForm/requestapi";
 
-import FlowStep from '@/views/taskplatform/taskmanagement/flowStep.vue'
+import FlowStep from "@/views/taskplatform/taskmanagement/flowStep.vue";
 
 const props = defineProps({
-	isshow:{
-		type:Boolean,
-		default:true
-	},
-	drawerWith:{
-		type:Number,
-		default:0
-	},
-	flowLogInfo:{
-		type:Object,
-		default(){
-			return {}
-		}
-	},
-	operState:{
-		type:Number,
-		default:1
-	}
-})
+  isshow: {
+    type: Boolean,
+    default: true,
+  },
+  drawerWith: {
+    type: Number,
+    default: 0,
+  },
+  flowLogInfo: {
+    type: Object,
+    default() {
+      return {};
+    },
+  },
+  operState: {
+    type: Number,
+    default: 1,
+  },
+});
 const flowAry = ref<any[]>();
-const emits = defineEmits(["update:isshow","getmytodolist"]);
-const isOpen =   computed({
-	get: () => props.isshow,
-	set: (val) => {
-		emits("update:isshow", val);
-	},
+const emits = defineEmits(["update:isshow", "getmytodolist"]);
+const isOpen = computed({
+  get: () => props.isshow,
+  set: (val) => {
+    emits("update:isshow", val);
+  },
 });
-const logistrue = ref(false)
-const formLoading  = ref(false)
-const loadingData = ref(false)			//加载表单数据
-const flowLoading = ref(false)			//加载流程数据
-const versiontitle = ref<any>("")
-const flowMap = ref<any>()
-const nextStep = ref(0)
-const nodeKey = ref<string>('');
-const currentProgress  = ref<number>(1);
-const newLogAry = ref<any>("")
-const oldLogAry = ref<any>("")
-const newDataLen  = ref<number>(0);
+const logistrue = ref(false);
+const formLoading = ref(false);
+const loadingData = ref(false); //加载表单数据
+const flowLoading = ref(false); //加载流程数据
+const versiontitle = ref<any>("");
+const flowMap = ref<any>();
+const nextStep = ref(0);
+const nodeKey = ref<string>("");
+const currentProgress = ref<number>(1);
+const newLogAry = ref<any>("");
+const oldLogAry = ref<any>("");
+const newDataLen = ref<number>(0);
 //表单相关内容
 const formState = reactive({
-    formData: {
-      list: [],
-      form: {},
-      config: {}
-    },
-    dict: {},
-    formId: 25,
-    id: 1,
-    loading: true
-})
-const formEl = ref<any>()
+  formData: {
+    list: [],
+    form: {},
+    config: {},
+  },
+  dict: {},
+  formId: 25,
+  id: 1,
+  loading: true,
+});
+const formEl = ref<any>();
 const drawerBeforeClose = () => {
-	// console.log("监听打开关闭",false)
-	emits("getmytodolist")
-	emits("update:isshow", false);
-}
+  // console.log("监听打开关闭",false)
+  emits("getmytodolist");
+  emits("update:isshow", false);
+};
 
-onMounted(()=>{
-	versiontitle.value = props.flowLogInfo.title
-	flowMap.value = JSON.parse(props.flowLogInfo.flowcont)
-	// console.log("监听打开关闭",props.flowLogInfo)
-	gainFormData()
-})
-const pageLog = ref<any[]>([])
+onMounted(() => {
+  versiontitle.value = props.flowLogInfo.title;
+  flowMap.value = JSON.parse(props.flowLogInfo.flowcont);
+  // console.log("监听打开关闭",props.flowLogInfo)
+  gainFormData();
+});
+const pageLog = ref<any[]>([]);
 //获取表单内容
-const gainFormData = () =>{
-	formLoading.value = true;
-	// console.log("获取表单内容--->",props.flowLogInfo)
-	nextStep.value = props.flowLogInfo.nextStep
-	nodeKey.value = props.flowLogInfo.nodeKey;
-	currentProgress.value = props.flowLogInfo.currentStep
-	// console.log("props.flowLogInfo--5-------->",props.flowLogInfo.mastesform)
-	formState.formData = stringToObj(props.flowLogInfo.mastesform)
+const gainFormData = () => {
+  formLoading.value = true;
+  // console.log("获取表单内容--->",props.flowLogInfo)
+  nextStep.value = props.flowLogInfo.nextStep;
+  nodeKey.value = props.flowLogInfo.nodeKey;
+  currentProgress.value = props.flowLogInfo.currentStep;
+  // console.log("props.flowLogInfo--5-------->",props.flowLogInfo.mastesform)
+  formState.formData = stringToObj(props.flowLogInfo.mastesform);
 
-	gainTaskFormInfo({ id: props.flowLogInfo.mastersKeyStr})
-					.then((data:any)=>{
-						if(data.data.logistrue){
-							formState.formData.list.push(editLookFormCont)
-						}
-						// console.log("res----获得数据回显------->",data)
-						formEl.value.setValue(data.data.masterDataInfo)
-						newLogAry.value = data.data.newData
-						oldLogAry.value = data.data.oldData
-						logistrue.value = data.data.logistrue
-						newDataLen.value = data.data.newDataLen
-						formLoading.value = false;
-						nextTick(()=>{
-							// console.log("获取自定义表单内容-1111-->",data.data.tableData)
-							formEl.value.setValue(data.data.tableData)
-						})
-					})
-					.finally(()=>{
-						formLoading.value = false;
-						gainEditDataLog({id:props.flowLogInfo.mastersKeyStr})
-						.then(({data})=>{
-							// console.log("获取修改记录-1111-->",data)
-							pageLog.value = data
-						});
-					})
-	// haveCustomerFormVersion({id:props.flowLogInfo.version_id.toString()})
-	// 		.then(({ data }) =>{
-				
-	// 			formState.dict = string2json(data.dict)
-	// 			judgeSubmitCancel({"name":data.mastesformjson})
-	// 				.then((dataBut:any) =>{
-	// 					if(dataBut.code == 0){
-	// 						formState.formData.list.push(afreshSubmitButton)
-	// 							// console.log("res----判断按钮------->",dataBut,props.operState)
-	// 							// if (dataBut.data == 3 || dataBut.data == 4){
-	// 							// 	formInfo.formData.list.push(editFormCont)
-	// 							// }
-	// 					}
-	// 				})
-	// 		})
-	// 		.finally(() => {
-	// 			formLoading.value = false;
-				
-					// formEl
-	// 	})
-}
-</script>
-<template>
-	<el-drawer  v-model="isOpen" v-loading="loadingData" element-loading-my-text="Loading..." :title="versiontitle"  :close-on-click-modal="false" :close-on-press-escape="false" :destroy-on-close="true" :size="props.drawerWith" class="drawerClass" :before-close="drawerBeforeClose">
-		<table border="0"  class="tableFlowBox">
-			<tr>
-				<td valign="top">
-					<div class="drawerFormBox boxLeft">
-						<ak-form
-							ref="formEl"
-							v-loading="formLoading" element-loading-text="Loading..."
-							:form-data="formState.formData"
-							:type="formType"
-							:dict="formState.dict"
-							request-url="getFormContent"
-							add-url="saveFormContent"
-							edit-url="editFormContent"
-							:before-submit="beforeSubmit"
-							:close-app-submit="closeAppSubmit"
-							:change-key-val="changeKeyVal"
-							:anew-submit = "anewSubmit"
-							:save-edit-form-info="saveEditFormInfo"
-							:send-draft-submit= "sendDraftSubmit"
-						/>
-						<el-divider v-if="pageLog&&pageLog.length > 0" content-position="left">历史2记录</el-divider>
-						<el-timeline>
-							<el-timeline-item v-for="(item,index) in pageLog" :key="index" :timestamp="item.time+' 操作人：'+item.creater" placement="top">
-								<el-card>
-									<el-descriptions  border>
-										<el-descriptions-item v-for="(mastItem,mastIndex) in item.masterdata" :key="mastIndex" :label="mastIndex">
-											{{mastItem}}
-										</el-descriptions-item>
-									</el-descriptions>
-									<el-tabs v-if="item.sunList" type="border-card" style="margin-top:20px;">
-										<el-tab-pane v-for="(sonItem,sonIndex) in item.sunList" :label="sonIndex" :key="sonIndex">
-											<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
-												<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" :label="sonKey">	{{sonCentor}}
-												</el-descriptions-item>
-											</el-descriptions>
-										</el-tab-pane>
-									</el-tabs>
-									<table style="margin-top:20px;">
-										<tr>
-											<td class="biankuang" width="100">修改说明：</td>
-											<td class="biankuang">{{item.explicate}}</td>
-										</tr>
-									</table>
-								</el-card>
-								
-								
-							</el-timeline-item>
-							
-							
-					
-						</el-timeline>
+  gainTaskFormInfo({ id: props.flowLogInfo.mastersKeyStr })
+    .then((data: any) => {
+      if (data.data.logistrue) {
+        formState.formData.list.push(editLookFormCont);
+      }
+      // console.log("res----获得数据回显------->",data)
+      formEl.value.setValue(data.data.masterDataInfo);
+      newLogAry.value = data.data.newData;
+      oldLogAry.value = data.data.oldData;
+      logistrue.value = data.data.logistrue;
+      newDataLen.value = data.data.newDataLen;
+      formLoading.value = false;
+      nextTick(() => {
+        // console.log("获取自定义表单内容-1111-->",data.data.tableData)
+        formEl.value.setValue(data.data.tableData);
+      });
+    })
+    .finally(() => {
+      formLoading.value = false;
+      gainEditDataLog({ id: props.flowLogInfo.mastersKeyStr }).then(({ data }) => {
+        // console.log("获取修改记录-1111-->",data)
+        pageLog.value = data;
+      });
+    });
+  // haveCustomerFormVersion({id:props.flowLogInfo.version_id.toString()})
+  // 		.then(({ data }) =>{
 
+  // 			formState.dict = string2json(data.dict)
+  // 			judgeSubmitCancel({"name":data.mastesformjson})
+  // 				.then((dataBut:any) =>{
+  // 					if(dataBut.code == 0){
+  // 						formState.formData.list.push(afreshSubmitButton)
+  // 							// console.log("res----判断按钮------->",dataBut,props.operState)
+  // 							// if (dataBut.data == 3 || dataBut.data == 4){
+  // 							// 	formInfo.formData.list.push(editFormCont)
+  // 							// }
+  // 					}
+  // 				})
+  // 		})
+  // 		.finally(() => {
+  // 			formLoading.value = false;
 
-					</div>
-				
-				</td>
-				<td valign="top" width="350">
-					<RunFlowStepApp ref="runstep" v-model:flowary="flowAry" :flow-key="props.flowLogInfo.idStr" :current-progress="currentProgress"  @updatelist="drawerBeforeClose" />
-				</td>
-			</tr>
-		</table>
-		
-	</el-drawer>
+  // formEl
+  // 	})
+};
+</script>
+<template>
+  <el-drawer
+    v-model="isOpen"
+    v-loading="loadingData"
+    element-loading-my-text="Loading..."
+    :title="versiontitle"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+    :size="props.drawerWith"
+    class="drawerClass"
+    :before-close="drawerBeforeClose"
+  >
+    <table border="0" class="tableFlowBox">
+      <tr>
+        <td valign="top">
+          <div class="drawerFormBox boxLeft">
+            <ak-form
+              ref="formEl"
+              v-loading="formLoading"
+              element-loading-text="Loading..."
+              :form-data="formState.formData"
+              :type="formType"
+              :dict="formState.dict"
+              request-url="getFormContent"
+              add-url="saveFormContent"
+              edit-url="editFormContent"
+              :before-submit="beforeSubmit"
+              :close-app-submit="closeAppSubmit"
+              :change-key-val="changeKeyVal"
+              :anew-submit="anewSubmit"
+              :save-edit-form-info="saveEditFormInfo"
+              :send-draft-submit="sendDraftSubmit"
+            />
+            <el-divider v-if="pageLog && pageLog.length > 0" content-position="left"
+              >历史2记录</el-divider
+            >
+            <el-timeline>
+              <el-timeline-item
+                v-for="(item, index) in pageLog"
+                :key="index"
+                :timestamp="item.time + ' 操作人：' + item.creater"
+                placement="top"
+              >
+                <el-card>
+                  <el-descriptions border>
+                    <el-descriptions-item
+                      v-for="(mastItem, mastIndex) in item.masterdata"
+                      :key="mastIndex"
+                      :label="mastIndex"
+                    >
+                      {{ mastItem }}
+                    </el-descriptions-item>
+                  </el-descriptions>
+                  <el-tabs
+                    v-if="item.sunList"
+                    type="border-card"
+                    style="margin-top: 20px"
+                  >
+                    <el-tab-pane
+                      v-for="(sonItem, sonIndex) in item.sunList"
+                      :label="sonIndex"
+                      :key="sonIndex"
+                    >
+                      <el-descriptions
+                        v-for="(sonVal, sonIndex) in sonItem"
+                        :key="sonIndex"
+                        border
+                      >
+                        <el-descriptions-item
+                          v-for="(sonCentor, sonKey) in sonVal"
+                          :key="sonKey"
+                          :label="sonKey"
+                        >
+                          {{ sonCentor }}
+                        </el-descriptions-item>
+                      </el-descriptions>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <table style="margin-top: 20px">
+                    <tr>
+                      <td class="biankuang" width="100">修改说明：</td>
+                      <td class="biankuang">{{ item.explicate }}</td>
+                    </tr>
+                  </table>
+                </el-card>
+              </el-timeline-item>
+            </el-timeline>
+          </div>
+        </td>
+        <td valign="top" width="350">
+          <RunFlowStepApp
+            ref="runstep"
+            v-model:flowary="flowAry"
+            :flow-key="props.flowLogInfo.idStr"
+            :current-progress="currentProgress"
+            @updatelist="drawerBeforeClose"
+          />
+        </td>
+      </tr>
+    </table>
+  </el-drawer>
 </template>
-<style  lang='scss' scoped>
-.biankuang{
-	border: 1px solid #D4D7DE;
-	padding:10px 10px;
+<style lang="scss" scoped>
+.biankuang {
+  border: 1px solid #d4d7de;
+  padding: 10px 10px;
 }
 </style>
diff --git a/vite.config.ts.timestamp-1731975545563-47f159282f4b9.mjs b/vite.config.ts.timestamp-1731975545563-47f159282f4b9.mjs
new file mode 100644
index 0000000..46e659b
--- /dev/null
+++ b/vite.config.ts.timestamp-1731975545563-47f159282f4b9.mjs
@@ -0,0 +1,196 @@
+// vite.config.ts
+import vue from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/@vitejs/plugin-vue/dist/index.mjs";
+import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite/dist/node/index.js";
+import AutoImport from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-auto-import/dist/vite.js";
+import Components from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/vite.mjs";
+import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-vue-components/dist/resolvers.mjs";
+import Icons from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/vite.mjs";
+import IconsResolver from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unplugin-icons/dist/resolver.mjs";
+import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/vite-plugin-svg-icons/dist/index.mjs";
+import UnoCSS from "file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/node_modules/unocss/dist/vite.mjs";
+import path from "path";
+var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\ShutongInterconnectedChemicalCloudPlatform";
+var pathSrc = path.resolve(__vite_injected_original_dirname, "src");
+var vite_config_default = defineConfig(({ mode }) => {
+  const env = loadEnv(mode, process.cwd());
+  return {
+    resolve: {
+      alias: {
+        "@": pathSrc
+      }
+    },
+    css: {
+      // CSS 预处理器
+      preprocessorOptions: {
+        //define global scss variable
+        scss: {
+          javascriptEnabled: true,
+          additionalData: `
+            @use "@/styles/variables.scss" as *;
+          `
+        }
+      }
+    },
+    server: {
+      host: "0.0.0.0",
+      port: Number(env.VITE_APP_PORT),
+      open: true,
+      // 运行是否自动打开浏览器
+      proxy: {
+        // 反向代理解决跨域
+        [env.VITE_APP_BASE_API]: {
+          target: env.VITE_APP_BASE_URL,
+          // 线上接口地址
+          // target: "http://vapi.youlai.tech", // 线上接口地址
+          // target: 'http://localhost:8989',  // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot
+          changeOrigin: true,
+          rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "")
+          // 替换 /dev-api 为 target 接口地址
+        }
+        // '/dev-api/kpiapi': {
+        //   target: 'http://127.0.0.1:6666',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/kpiapi'), ""),
+        // },
+        // '/dev-api/systemapi': {
+        //   target: 'http://127.0.0.1:17777',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/systemapi'), ""),
+        // },
+        // '/dev-api/hrapi': {
+        //   target: 'http://127.0.0.1:39168',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/hrapi'), ""),
+        // },
+        // '/dev-api/api': {
+        //   target: 'http://127.0.0.1:8888',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/api'), ""),
+        // },
+        // '/dev-api/javasys': {
+        //   target: 'http://172.20.2.87:8111',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys'), ""),
+        // },
+        // '/dev-api/javasys/lowCode ': {
+        //   target: 'http://172.20.2.87:8112',
+        //   changeOrigin: true,
+        //   rewrite: (path) =>
+        //     path.replace(new RegExp("^" + '/dev-api/javasys/lowCode '), ""),
+        // }
+      }
+    },
+    plugins: [
+      vue(),
+      UnoCSS({
+        /* options */
+      }),
+      AutoImport({
+        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        imports: ["vue", "@vueuse/core"],
+        //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理
+        eslintrc: {
+          enabled: false,
+          //  Default `false`
+          filepath: "./.eslintrc-auto-import.json",
+          // Default `./.eslintrc-auto-import.json`
+          globalsPropValue: true
+          // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')
+        },
+        resolvers: [
+          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          ElementPlusResolver(),
+          // 自动导入图标组件
+          IconsResolver({})
+        ],
+        vueTemplate: true,
+        // 是否在 vue 模板中自动导入
+        dts: path.resolve(pathSrc, "types", "auto-imports.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Components({
+        resolvers: [
+          // 自动注册图标组件
+          IconsResolver({
+            enabledCollections: ["ep"]
+            //@iconify-json/ep 是 Element Plus 的图标库
+          }),
+          // 自动导入 Element Plus 组件
+          ElementPlusResolver()
+        ],
+        dts: path.resolve(pathSrc, "types", "components.d.ts")
+        //  自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成
+      }),
+      Icons({
+        // 自动安装图标库
+        autoInstall: true
+      }),
+      createSvgIconsPlugin({
+        // 指定需要缓存的图标文件夹
+        iconDirs: [path.resolve(pathSrc, "assets/icons")],
+        // 指定symbolId格式
+        symbolId: "icon-[dir]-[name]"
+      })
+    ],
+    optimizeDeps: {
+      include: [
+        "vue",
+        "vue-router",
+        "pinia",
+        "axios",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/alert/style/css",
+        "@vueuse/core",
+        "path-to-regexp",
+        "echarts",
+        "@wangeditor/editor",
+        "@wangeditor/editor-for-vue",
+        "vue-i18n"
+      ]
+    }
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\ShutongInterconnectedChemicalCloudPlatform\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/ShutongInterconnectedChemicalCloudPlatform/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\n\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\n\nimport AutoImport from \"unplugin-auto-import/vite\";\nimport Components from \"unplugin-vue-components/vite\";\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\n\nimport Icons from \"unplugin-icons/vite\";\nimport IconsResolver from \"unplugin-icons/resolver\";\n\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\n\nimport UnoCSS from \"unocss/vite\";\n\nimport path from \"path\";\nconst pathSrc = path.resolve(__dirname, \"src\");\n\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\n  const env = loadEnv(mode, process.cwd());\n  return {\n    resolve: {\n      alias: {\n        \"@\": pathSrc,\n      },\n    },\n    css: {\n      // CSS \u9884\u5904\u7406\u5668\n      preprocessorOptions: {\n        //define global scss variable\n        scss: {\n          javascriptEnabled: true,\n          additionalData: `\n            @use \"@/styles/variables.scss\" as *;\n          `,\n        },\n      },\n    },\n    server: {\n      host: \"0.0.0.0\",\n      port: Number(env.VITE_APP_PORT),\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\n      proxy: {\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\n        [env.VITE_APP_BASE_API]: {\n          target: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\n          changeOrigin: true,\n          rewrite: (path) =>\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\n        },\n        // '/dev-api/kpiapi': {\n        //   target: 'http://127.0.0.1:6666',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/kpiapi'), \"\"),\n        // },\n\n        // '/dev-api/systemapi': {\n        //   target: 'http://127.0.0.1:17777',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/systemapi'), \"\"),\n        // },\n        // '/dev-api/hrapi': {\n        //   target: 'http://127.0.0.1:39168',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/hrapi'), \"\"),\n        // },\n        // '/dev-api/api': {\n        //   target: 'http://127.0.0.1:8888',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/api'), \"\"),\n        // },\n        // '/dev-api/javasys': {\n        //   target: 'http://172.20.2.87:8111',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys'), \"\"),\n        // },\n        // '/dev-api/javasys/lowCode ': {\n        //   target: 'http://172.20.2.87:8112',\n        //   changeOrigin: true,\n        //   rewrite: (path) =>\n        //     path.replace(new RegExp(\"^\" + '/dev-api/javasys/lowCode '), \"\"),\n        // }\n      },\n    },\n\n    plugins: [\n\n      vue(),\n      UnoCSS({\n        /* options */\n      }),\n      AutoImport({\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\n        imports: [\"vue\", \"@vueuse/core\"],\n        //ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\n        eslintrc: {\n          enabled: false, //  Default `false`\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\n        },\n        resolvers: [\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\n          ElementPlusResolver(),\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\n          IconsResolver({}),\n        ],\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\n      }),\n\n      Components({\n        resolvers: [\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\n          IconsResolver({\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\n          }),\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\n          ElementPlusResolver(),\n        ],\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\n      }),\n\n      Icons({\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\n        autoInstall: true,\n      }),\n\n      createSvgIconsPlugin({\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\n        symbolId: \"icon-[dir]-[name]\",\n      }),\n    ],\n\n    optimizeDeps: {\n      include: [\n        \"vue\",\n        \"vue-router\",\n        \"pinia\",\n        \"axios\",\n        \"element-plus/es/components/form/style/css\",\n        \"element-plus/es/components/form-item/style/css\",\n        \"element-plus/es/components/button/style/css\",\n        \"element-plus/es/components/input/style/css\",\n        \"element-plus/es/components/input-number/style/css\",\n        \"element-plus/es/components/switch/style/css\",\n        \"element-plus/es/components/upload/style/css\",\n        \"element-plus/es/components/menu/style/css\",\n        \"element-plus/es/components/col/style/css\",\n        \"element-plus/es/components/icon/style/css\",\n        \"element-plus/es/components/row/style/css\",\n        \"element-plus/es/components/tag/style/css\",\n        \"element-plus/es/components/dialog/style/css\",\n        \"element-plus/es/components/loading/style/css\",\n        \"element-plus/es/components/radio/style/css\",\n        \"element-plus/es/components/radio-group/style/css\",\n        \"element-plus/es/components/popover/style/css\",\n        \"element-plus/es/components/scrollbar/style/css\",\n        \"element-plus/es/components/tooltip/style/css\",\n        \"element-plus/es/components/dropdown/style/css\",\n        \"element-plus/es/components/dropdown-menu/style/css\",\n        \"element-plus/es/components/dropdown-item/style/css\",\n        \"element-plus/es/components/sub-menu/style/css\",\n        \"element-plus/es/components/menu-item/style/css\",\n        \"element-plus/es/components/divider/style/css\",\n        \"element-plus/es/components/card/style/css\",\n        \"element-plus/es/components/link/style/css\",\n        \"element-plus/es/components/breadcrumb/style/css\",\n        \"element-plus/es/components/breadcrumb-item/style/css\",\n        \"element-plus/es/components/table/style/css\",\n        \"element-plus/es/components/tree-select/style/css\",\n        \"element-plus/es/components/table-column/style/css\",\n        \"element-plus/es/components/select/style/css\",\n        \"element-plus/es/components/option/style/css\",\n        \"element-plus/es/components/pagination/style/css\",\n        \"element-plus/es/components/tree/style/css\",\n        \"element-plus/es/components/alert/style/css\",\n        \"@vueuse/core\",\n\n        \"path-to-regexp\",\n        \"echarts\",\n        \"@wangeditor/editor\",\n        \"@wangeditor/editor-for-vue\",\n        \"vue-i18n\",\n      ],\n    },\n  };\n});\n"],
  "mappings": ";AAA0Z,OAAO,SAAS;AAE1a,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,OAAO,UAAU;AAfjB,IAAM,mCAAmC;AAgBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGZ,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,MAsCF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}
