From 12358ad8b805501134464bd319ca15b0a6b4669b Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Sat, 14 Sep 2024 15:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/sumdb/sum.golang.org/latest | 5 +++ src/components/DesignForm/formControlAttr.vue | 4 +- .../DesignForm/formControlPropertiNew.vue | 4 +- .../DesignForm/public/expand/org.vue | 9 ++++- .../DesignForm/public/expand/userDialog.vue | 4 +- .../DesignForm/tableListPage/index.vue | 4 +- .../lowcodepage/appPage/appMenus.vue | 40 ++++++++++++++----- .../appPage/appPageForm/pageList.vue | 9 +++-- 8 files changed, 56 insertions(+), 23 deletions(-) create mode 100644 pkg/sumdb/sum.golang.org/latest diff --git a/pkg/sumdb/sum.golang.org/latest b/pkg/sumdb/sum.golang.org/latest new file mode 100644 index 0000000..31dde1f --- /dev/null +++ b/pkg/sumdb/sum.golang.org/latest @@ -0,0 +1,5 @@ +go.sum database tree +29530890 +yb6t6HZvxxy4PrtbS+3QjpejyjLeRuqQ2INBTisrK38= + +— sum.golang.org Az3grvtY2DM7q7cq6/vo+qjK+WpbUaK7FrxZoFBSvTJ3U6QlFARxFVdrEusYH48zS1BENhlysJZH2iz7XZmGlOf1aAU= diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index 0153dd5..f25b9c5 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/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'], diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 5806406..a825390 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/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'], diff --git a/src/components/DesignForm/public/expand/org.vue b/src/components/DesignForm/public/expand/org.vue index fae9667..c00f204 100644 --- a/src/components/DesignForm/public/expand/org.vue +++ b/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;}) diff --git a/src/components/DesignForm/public/expand/userDialog.vue b/src/components/DesignForm/public/expand/userDialog.vue index 5cf031c..07859f7 100644 --- a/src/components/DesignForm/public/expand/userDialog.vue +++ b/src/components/DesignForm/public/expand/userDialog.vue @@ -24,7 +24,7 @@ const visible = ref(false) // 侧栏处理 const treeEl = ref() const treeData = ref([]) -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 diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue index 280a3bf..da5c9dd 100644 --- a/src/components/DesignForm/tableListPage/index.vue +++ b/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) => { > - + diff --git a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue b/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue index b36541c..9325ebb 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appMenus.vue +++ b/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) =>{ 新建页面 隐藏PC端取消-隐藏PC端 隐藏移动端取消-隐藏移动端 - 删除 + + 删除 + diff --git a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue b/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue index 5267d75..6e616fb 100644 --- a/src/views/sysworkflow/lowcodepage/appPage/appPageForm/pageList.vue +++ b/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())