Merge branch 'qin_v4'

package.json

@@ -80,7 +80,8 @@
     "vue-router": "^4.2.0",
     "vue3-dnd": "^2.1.0",
     "vuedraggable": "^4.1.0",
-    "vuedraggable-es": "^4.1.1"
+    "vuedraggable-es": "^4.1.1",
+    "websocket": "^1.0.35"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.6.3",

src/components/DesignForm/formControlPropertiNew.vue

@@ -2593,6 +2593,8 @@ watch(()=>controlData.value.control,(newVal) => {
 
 //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){
@@ -4536,7 +4538,9 @@ const radioChangeSet = (val:any) => {
                         @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 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>
                     <!--
                         
                         

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

@@ -307,7 +307,8 @@ const getAxiosOptions = debounce((data?: any) => {
 })
 watch(
     () => props.data.control.optionsValue3Field,
-    () => {
+    (val:any) => {
+		console.log("监听--optionsValue3Field-》",val)
 		getAxiosOptions() 
     }
 )

src/views/sysworkflow/codepage/page.vue

@@ -18,7 +18,7 @@ onUnmounted(() => {
 });
 
 function connect() {
-	ws.value = new WebSocket('ws://120.0.0.1:14250');
+	ws.value = new WebSocket('ws://127.0.0.1:17777/ws/regist');
 	
 	ws.value.onopen = function(event) {
 		console.log('WebSocket 连接已打开', event);
@@ -32,8 +32,9 @@ function connect() {
 		console.log('收到消息', event.data);
 	};
 	
-	ws.value.onclose = function() {
-		console.log('WebSocket 连接已关闭');
+	ws.value.onclose = function(err) {
+		console.log('WebSocket 连接已关闭',err);
+		setTimeout(connect, 3000);
 	};
 }
 

src/views/sysworkflow/lowcodepage/appPage/appMenus.vue

@@ -330,7 +330,7 @@ const openAppPage = (val:any) =>{
 					<el-dropdown-item @click="editMenuName(data)">修改名称</el-dropdown-item>
 					<!-- <el-dropdown-item @click="">复制</el-dropdown-item> -->
 					<!-- <el-dropdown-item @click="moveMenus(data)">移动到</el-dropdown-item> -->
-					<el-dropdown-item divided @click="addNewSunMenuGroup(data)">新建子分组</el-dropdown-item>
+					<el-dropdown-item  v-if="data.type==1" divided @click="addNewSunMenuGroup(data)">新建子分组</el-dropdown-item>
 					<!-- <el-dropdown-item @click="">新建普通表单</el-dropdown-item>
 					<el-dropdown-item @click="">新建流程表单</el-dropdown-item> -->
 					<el-dropdown-item v-if="data.type==1" @click="createNewPage(data.id)">新建页面</el-dropdown-item>