修改优化

pkg/sumdb/sum.golang.org/latest

@@ -0,0 +1,5 @@
+go.sum database tree
+29530890
+yb6t6HZvxxy4PrtbS+3QjpejyjLeRuqQ2INBTisrK38=
+
+— sum.golang.org Az3grvtY2DM7q7cq6/vo+qjK+WpbUaK7FrxZoFBSvTJ3U6QlFARxFVdrEusYH48zS1BENhlysJZH2iz7XZmGlOf1aAU=

src/components/DesignForm/formControlAttr.vue

@@ -880,7 +880,7 @@
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -898,7 +898,7 @@
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间类型',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],

src/components/DesignForm/formControlPropertiNew.vue

@@ -956,7 +956,7 @@ const attrList = computed(() => {
                     isNum: true
                 },
                 {
-                    label: 'type',
+                    label: '显示类型',
                     value: control.type,
                     path: 'control.type',
                     vShow: ['datePicker'],
@@ -974,7 +974,7 @@ const attrList = computed(() => {
                     }
                 },
                 {
-                    label: 'format',
+                    label: '时间格式',
                     value: control.format,
                     path: 'control.format',
                     vShow: ['datePicker', 'timePicker'],

src/components/DesignForm/public/expand/org.vue

@@ -19,7 +19,12 @@ const emits = defineEmits<{
 }>()
 const value = computed({
 	get: () => {
-		return props.modelValue*1
+		if (props.modelValue != "" && props.modelValue != undefined){
+			return props.modelValue*1
+		}else{
+			return props.modelValue
+		}
+		
 	},
 	set: (newVal: any) => {
 		emits('update:modelValue', newVal)
@@ -48,7 +53,7 @@ const orgTreeProps ={
 
 function haveOrgTreeInfo(){
 	orgTreeLoading.value = true;
-	getOrgTreeList({})
+	getOrgTreeList({"orgid": 309})
 		.then(({ data })=>{
 			orgTreeList.value = data
 		}).finally(()=>{orgTreeLoading.value = false;})

src/components/DesignForm/public/expand/userDialog.vue

@@ -24,7 +24,7 @@ const visible = ref(false)
 // 侧栏处理
 const treeEl = ref()
 const treeData = ref<orgform[]>([])
-const department = ref()
+const department = ref(309)
 const handleNodeClick = (data: any) => {
     department.value = data.id
 	getUserList()
@@ -33,7 +33,7 @@ const getTreeData = () => {
     // getRequest('deptList', {}).then((res: any) => {
     //   treeData.value = formatResult(res.data, 'transformDataToChild')
     // })
-	getOrgFormTree()
+	getOrgFormTree({id:309})
 		.then(({ data }) => {
 			// console.log(data)
 			treeData.value = data.list

src/components/DesignForm/tableListPage/index.vue

@@ -214,7 +214,7 @@ const setUpClick = (val:string,id:string) =>{
 					.then((data)=>{
 						// console.log('cancel!',data)
 						ElNotification({
-							title: '温馨提示！',
+							title: '提示信息！',
 							message: data.mag,
 							type: 'success',
 						})
@@ -1296,7 +1296,7 @@ const transformOption = (val: string | number, type?: string) => {
 							>
 								<el-button type="info" size="small" class="fa fa-edit"  />
 							</el-tooltip>
-							</el-button-group>
+				</el-button-group>
 			
 			
 			</el-col>

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

@@ -235,15 +235,33 @@ const showOrHide = (val:appMenuTreeInfo,types:number) =>{
 */
 const editAppMenu = (val:appMenuTreeInfo) =>{
 	// console.log('editAppMenu:',val);
-	let sendInfo = {
-		id:val.id.toString(),
-		status:3
-	}
-	delAppMenu(sendInfo)
-		.then((data) =>{
-			// console.log('删除app自定义菜单:',data);
-			gainSunAppContent()
-		});
+	ElMessageBox.confirm(
+		"您确定要删除此项？一经删除！将不可恢复！请慎重操作",
+		"删除提示",
+		{
+			confirmButtonText: '确定',
+			cancelButtonText: '取消',
+			type: 'warning',
+		}
+	)
+	.then(() => {
+		let sendInfo = {
+			id:val.id.toString(),
+			status:3
+		}
+		delAppMenu(sendInfo)
+			.then((data) =>{
+				// console.log('删除app自定义菜单:',data);
+				gainSunAppContent()
+				ElMessage({
+					type: 'success',
+					message: data.msg,
+				})
+			});
+	})
+
+
+	
 }
 const saveAppFormIsShow = ref(false)
 /**
@@ -336,7 +354,9 @@ const openAppPage = (val:any) =>{
 					<el-dropdown-item v-if="data.type==1" @click="createNewPage(data.id)">新建页面</el-dropdown-item>
 					<el-dropdown-item @click="showOrHide(data,1)" divided><el-text v-if="data.pcIsShow==1">隐藏PC端</el-text><el-text v-else>取消-隐藏PC端</el-text></el-dropdown-item>
 					<el-dropdown-item @click="showOrHide(data,2)"><el-text v-if="data.wapIsShow==1">隐藏移动端</el-text><el-text v-else>取消-隐藏移动端</el-text></el-dropdown-item>
-					<el-dropdown-item @click="editAppMenu(data)" divided><el-text class="mx-1" type="danger">删除</el-text></el-dropdown-item>
+					<el-dropdown-item @click="editAppMenu(data)" divided>
+						<el-text class="mx-1" type="danger">删除</el-text>
+					</el-dropdown-item>
 				</template>
 			</el-dropdown>
 		</div>

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

@@ -271,9 +271,13 @@ const jieForm = () => {
 	if(props.appPageKey != ""){
 		gainFormTableField({id:props.appPageKey.toString()})
 			.then((data)=>{
-				// console.log('解析表单--->',data)
+				console.log('解析表单--->',data)
 				formTableField.masterTable=data.data.masterTable
 				formTableField.sunTable=data.data.sunTable
+				nextTick(()=>{
+					columnDrop()
+					getListInfo();
+				})
 			})
 	}
 }
@@ -286,8 +290,7 @@ const jieForm = () => {
 onMounted(()=>{
 	jieForm();
 	nextTick(() => {
-      	columnDrop()
-		getListInfo();
+      	
 
 
 		gainFormTableKeyWord(props.appPageKey.toString())