From 671dfd98daa9eab8d9d735ef373fc8b2feb93cd2 Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期一, 09 九月 2024 10:50:22 +0800 Subject: [PATCH] Revert "ces" --- src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue | 346 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 296 insertions(+), 50 deletions(-) diff --git a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue index 88255d2..7b2a3b9 100644 --- a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue +++ b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue @@ -1,5 +1,24 @@ <template> - <HMContainer type="card" v-if="supervisorMgrShow"> + <AHMContainer type="card" v-if="supervisorMgrShow"> + <template #aside> + <!-- 鐩綍鏍� --> + <LeftTreeByMgr + v-loading="treeLoading" + class="h100" + ref="leftTreeRef" + :treedata="listTreeData" + title-name="鍒嗙粍鍒楄〃" + :show-more-operate="true" + :show-add="true" + :current-node-key="currentListID" + :node-icon="() => 'ele-Document'" + @click="handleClickNode" + @tree-edit="openOperateModuleDialog" + @tree-delete="deleteCurrentModule" + @tree-add="openOperateModuleDialog" + > + </LeftTreeByMgr> + </template> <template #header> <el-form ref="queryFormRef" :inline="true" :model="queryParams"> <el-form-item label="鏍囬" prop="title"> @@ -14,10 +33,6 @@ </el-form> </template> <template #main> - <!-- <div class="h-screen"> - <p>vue-json-editor</p> - <JsonEditorVue v-model="jsonMsg"></JsonEditorVue> - </div> --> <div class="h-full" ref="chatDragContainerRef"> <el-table v-loading="tableLoading" @@ -36,32 +51,24 @@ </div> </template> </el-table-column> --> - <el-table-column prop="id" label="id" width="130" fixed="left" show-overflow-tooltip> </el-table-column> + <!-- <el-table-column prop="id" label="id" width="130" fixed="left" show-overflow-tooltip> </el-table-column> --> <el-table-column prop="title" label="鏍囬" width="300" fixed="left" show-overflow-tooltip> </el-table-column> <el-table-column prop="prompt" label="鎻愮ず璇�" show-overflow-tooltip> </el-table-column> - <el-table-column prop="published" label="鐘舵��" width="120" show-overflow-tooltip> - <template #default="scope"> - <el-select - :modelValue="displayTableData[scope.$index].published" - @change="(value) => publishStatusChange(value, scope.row.id, scope.$index)" - > - <el-option - v-for="item in Object.keys(supervisorPublishedMap)" - :key="item" - :value="item" - :label="supervisorPublishedMap[item]" - ></el-option> - </el-select> - </template> - </el-table-column> + <el-table-column label="鍒涘缓浜�" prop="creator" width="100" show-overflow-tooltip> </el-table-column> <el-table-column label="鍒涘缓鏃堕棿" prop="create_time" width="105" show-overflow-tooltip> </el-table-column> <el-table-column label="鏇存柊鏃堕棿" prop="update_time" width="105" show-overflow-tooltip> </el-table-column> - <el-table-column label="澶囨敞" prop="note" show-overflow-tooltip> </el-table-column> - <el-table-column label="鎿嶄綔" width="150" fixed="right" show-overflow-tooltip> + <el-table-column label="鍙戝竷鐘舵��" prop="published" width="85" show-overflow-tooltip> <template #default="scope"> - <div class="space-x-2.5 items-center flex"> + {{ supervisorPublishedMap[scope.row.published] }} + </template> + </el-table-column> + + <el-table-column label="澶囨敞" prop="note" show-overflow-tooltip> </el-table-column> + <el-table-column label="鎿嶄綔" width="200" fixed="right" show-overflow-tooltip> + <template #default="scope"> + <div class="space-x-3 items-center flex"> <el-tooltip effect="dark" content="SQL缂栬緫" placement="top"> <i class="ywifont ywicon-sql !text-[14px] text-blue-400 cursor-pointer" @click="editSqlClick(scope.row)"></i> </el-tooltip> @@ -70,6 +77,26 @@ </el-tooltip> <el-tooltip effect="dark" content="瀵硅瘽娴嬭瘯" placement="top"> <i class="ywifont ywicon-ceshi !text-[20px] text-blue-400 cursor-pointer" @click="openChatTest(scope.row)"></i> + </el-tooltip> + + <el-tooltip + effect="dark" + :content="scope.row.published === SupervisorPublished.Y ? '鍙栨秷鍙戝竷' : '鍙戝竷'" + placement="top" + > + <i + class="ywifont !text-[20px] cursor-pointer" + :class="[ + scope.row.published === SupervisorPublished.Y ? 'ywicon-quxiaofabu text-red-400' : 'ywicon-fabu text-blue-400', + ]" + @click=" + publishStatusChange( + scope.row.published === SupervisorPublished.Y ? SupervisorPublished.N : SupervisorPublished.Y, + scope.row.id, + scope.$index + ) + " + ></i> </el-tooltip> <el-tooltip effect="dark" content="缂栬緫" placement="top"> <i class="ywifont ywicon-bianji !text-[15px] text-blue-400 cursor-pointer" @click="openOptDlg(scope.row)"></i> @@ -111,47 +138,235 @@ </div> </template> - <OptDlg v-model="optDlgIsShow" :item="optDlgMapRow" @insert="insertOpt" @update="updateOpt"></OptDlg> - </HMContainer> - <SqlAmisEdit v-else :supervisor="sqlEditMapSupervisor" @backLastPage="backLastPage"></SqlAmisEdit> + <OptDlg v-model="optDlgIsShow" :item="optDlgMapRow" @insert="insertOpt" @update="updateOpt" :groupId="currentListID"></OptDlg> + + <!-- 澧炲姞銆佷慨鏀规暟鎹璇濇 --> + <el-dialog + :destroy-on-close="true" + v-model="moduleDialogIsShow" + width="400" + :close-on-click-modal="false" + @closed="closeModuleDialog" + > + <template #header> + <div style="color: #fff"> + <SvgIcon :name="moduleDialogHeaderIcon" :size="16" style="margin-right: 3px; display: inline; vertical-align: middle" /> + <span> {{ moduleDialogTitle }} </span> + </div> + </template> + + <el-form :model="moduleDialogFormValue" ref="moduleDialogFormRef" :rules="moduleDialogFormRules" label-width="55"> + <el-form-item label="鍚嶇О" prop="title"> + <el-input placeholder="璇疯緭鍏ュ悕绉�" v-model="moduleDialogFormValue.title"></el-input> + </el-form-item> + <el-form-item label="鐖剁骇" prop="parent" v-if="!isEditModuleDialog"> + <el-tree-select + filterable + class="w100" + v-model="moduleDialogFormValue.parent" + :props="{ + id: 'id', + label: 'title', + children: 'children', + }" + :data="parentSelectOptions" + node-key="id" + :clearable="true" + :accordion="false" + :expandNode="false" + :check-strictly="true" + placeholder="璇烽�夋嫨鐖剁骇" + > + </el-tree-select> + </el-form-item> + </el-form> + <template #footer> + <div> + <el-button @click="closeModuleDialog">鍙� 娑�</el-button> + <el-button type="primary" @click="submitModuleFormValue">纭� 瀹�</el-button> + </div> + </template> + </el-dialog> + </AHMContainer> + <SqlAmisEdit v-else :supervisor="sqlEditMapSupervisor" @backLastPage="backLastPage" @updatePublished="updatePublishedById"></SqlAmisEdit> </template> <script setup lang="ts"> -import { deleteCurrentRow } from '/@/utils/util'; import { useDraggable } from '@vueuse/core'; +import { deleteCurrentRow, travelTree } from '/@/utils/util'; -import { onMounted, ref } from 'vue'; -import HMContainer from '/@/components/layout/HMContainer.vue'; +import { computed, onMounted, ref } from 'vue'; import { usePageDisplay } from '/@/hooks/usePageDisplay'; import { useQueryTable } from '/@/hooks/useQueryTable'; // import { useTableSort } from '/@/hooks/useTableSort'; // import { useValidateUniqueness } from '/@/hooks/useValidateUniqueness'; -import Chat from '/@/components/chat/Chat.vue'; +import type { FormInstance, FormRules } from 'element-plus'; +import { ElMessage, ElMessageBox } from 'element-plus'; +import { nextTick } from 'vue'; import SqlAmisEdit from './edit/SqlAmisEdit.vue'; import OptDlg from './optDlg/OptDlg.vue'; import { SupervisorPublished, supervisorPublishedMap } from './types'; import * as supervisorAdminApi from '/@/api/supervisorAdmin'; import { checkSupervisorValidate, updatePublishStatus } from '/@/api/supervisorAdmin'; -import JsonEditor from '/@/components/form/jsonEditor/JsonEditor.vue'; -import amisLogo from '/@/assets/logo/amis-logo.png'; +import Chat from '/@/components/chat/Chat.vue'; +import emitter from '/@/utils/mitt'; +import { deepClone } from '/@/utils/other'; import { gotoRoute } from '/@/utils/route'; import { useCompRef } from '/@/utils/types'; -import { nextTick } from 'vue'; +import { convertListToTree } from '/@/utils/util'; + +import * as supervisorGroupApi from '/@/api/supervisorAdmin/supervisorGroup'; +import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue'; +import AHMContainer from '/@/components/layout/AHMContainer.vue'; +import { useUpdateData } from '/@/hooks/useUpdateData'; + +//#region ====================== 宸︿晶鏍戞暟鎹紝tree init ====================== +const leftTreeRef = ref(null); +const treeLoading = ref(false); +const listData = ref([]); +const currentListID = computed(() => currentNode.value?.id); +const currentNode = ref(null); + +const listTreeData = computed(() => { + return convertListToTree(listData.value); +}); + +const updateRelatedType = (extendType) => { + emitter.emit('basic.sys.type.update', { + ExtendType: extendType, + }); +}; +const handleClickNode = (data) => { + nextTick(() => { + leftTreeRef.value?.treeRef.setCurrentKey(data.id); + }); + currentNode.value = data; + getTableData(); +}; +const getListTreeData = async () => { + const res = await supervisorGroupApi.getSupervisorGroupList(); + listData.value = res.values || []; + const firstListTreeNode = listTreeData.value[0]; + if (firstListTreeNode) { + handleClickNode(firstListTreeNode); + } else { + tableData.value = []; + currentNode.value = null; + } +}; +//#endregion + +//#region ====================== 鍒犻櫎宸︿晶鏍戠郴缁熸ā鍧楁暟鎹� ====================== + +const deleteCurrentModule = (row: any) => { + ElMessageBox.confirm(`纭畾鍒犻櫎椤甸潰鍒嗙粍锛氥��${row.title}銆�?`, '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning', + }).then(async () => { + const res = await supervisorGroupApi.deleteSupervisorGroup({ + group_id: row.id, + }); + ElMessage.success('鍒犻櫎鎴愬姛锛�'); + const foundIndex = listData.value.findIndex((item) => row.id === item.id); + listData.value.splice(foundIndex, 1); + }); +}; +//#endregion + +//#region ====================== 澧炲姞銆佸垹闄ょ郴缁熸ā鍧楁搷浣�, dialog init====================== +const isEditModuleDialog = ref(false); +const moduleDialogTitle = computed(() => { + return isEditModuleDialog.value ? '淇敼椤甸潰鍒嗙粍' : '娣诲姞椤甸潰鍒嗙粍'; +}); +const moduleDialogHeaderIcon = computed(() => { + return isEditModuleDialog.value ? 'ele-Edit' : 'ele-Plus'; +}); +const moduleDialogFormValue = ref({ + Name: '', + Code: '', + Description: '', +}) as any; +const moduleDialogIsShow = ref(false); +const moduleDialogFormRef = ref<FormInstance>(null); + +const moduleDialogFormRules = ref<FormRules>({ + title: [{ required: true, message: '璇疯緭鍏ユ爣棰�', trigger: 'blur' }], +}); +const openOperateModuleDialog = (data?) => { + if (data) { + isEditModuleDialog.value = true; + const { id, title } = data; + moduleDialogFormValue.value = deepClone({ group_id: id, title }); + } else { + isEditModuleDialog.value = false; + moduleDialogFormValue.value = { title: '', parent: '' }; + } + moduleDialogIsShow.value = true; +}; + +const closeModuleDialog = () => { + moduleDialogIsShow.value = false; + moduleDialogFormRef.value.clearValidate(); +}; +const parentSelectOptions = computed(() => { + const cloneTreeData = deepClone(listTreeData.value); + travelTree(cloneTreeData, (value, index, array, parent) => { + if ((value as any).id === moduleDialogFormValue.value.id) { + if (parent === array) { + parent?.splice(index, 1); + } else { + parent?.Children?.splice(index, 1); + } + } + }); + return cloneTreeData; +}); + +const submitModuleFormValue = async () => { + const valid = await moduleDialogFormRef.value.validate().catch(() => {}); + if (!valid) return; + + if (isEditModuleDialog.value) { + const res = await supervisorGroupApi.updateSupervisorGroup(moduleDialogFormValue.value); + const foundIndex = listData.value.findIndex((item) => item.id === moduleDialogFormValue.value.id); + if (foundIndex > -1) { + listData.value[foundIndex] = { + ...listData.value[foundIndex], + title: moduleDialogFormValue.value.title, + }; + } + getListTreeData(); + moduleDialogIsShow.value = false; + ElMessage.success('淇敼椤甸潰鍒嗙粍鎴愬姛'); + } else { + const res = await supervisorGroupApi.addSupervisorGroup(moduleDialogFormValue.value); + listData.value.push({ + ...moduleDialogFormValue.value, + id: res.group_id, + }); + moduleDialogIsShow.value = false; + ElMessage.success('娣诲姞椤甸潰鍒嗙粍鎴愬姛'); + } +}; +//#endregion + //#region ====================== 琛ㄦ牸鏁版嵁锛宼able init ====================== const tableLoading = ref(false); const tableData = ref([]); const isDragStatus = ref(false); +const allTableData = ref(null); const getTableData = async () => { - tableLoading.value = true; - const res = await supervisorAdminApi.getSupervisorList().finally(() => { - tableLoading.value = false; - }); - tableData.value = (res.values || []).map((item) => { - item.create_time = item.create_time?.slice(0, 10); - item.update_time = item.create_time?.slice(0, 10); + if (!allTableData.value) { + const res = await supervisorAdminApi.getSupervisorList(); + allTableData.value = (res.values || []).map((item) => { + item.create_time = item.create_time?.slice(0, 10); + item.update_time = item.update_time?.slice(0, 10); - return item; - }); + return item; + }); + } + tableData.value = allTableData.value.filter((item) => item.group_id === currentListID.value); }; //#endregion @@ -219,13 +434,34 @@ tableData.value.unshift({ ...newData, published: SupervisorPublished.N }); }; //#endregion + +const updatePublishedById = (id: string, published: SupervisorPublished) => { + const row = tableData.value.find((item) => item.id === id); + if (row) { + row.published = published; + } +}; //#region ====================== 鏀瑰彉鍙戝竷鐘舵�� ====================== -const publishStatusChange = async (isPublished: SupervisorPublished, id, index) => { - const res = await updatePublishStatus({ - id: id, - publish: isPublished, - }); - displayTableData.value[index].published = isPublished; +const publishStatusChange = async (published: SupervisorPublished, id, index) => { + const res = await updatePublishStatus( + { + id: id, + publish: published, + }, + { + loading: false, + } + ); + const origin = published === SupervisorPublished.Y ? SupervisorPublished.N : SupervisorPublished.Y; + const final = res.publish ?? origin; + if (final === origin) { + ElMessage.warning('鎿嶄綔澶辫触' + (res.fail_msg ? `锛�${res.fail_msg}` : '')); + return; + } + + tableData.value[index].published = final; + + published === SupervisorPublished.Y ? ElMessage.success('鍙戝竷鎴愬姛') : ElMessage.info('宸插彇娑堝彂甯�'); }; //#endregion @@ -284,8 +520,18 @@ return res; }; //#endregion + +//#region ====================== 鏇存柊鍙戝竷鐘舵�� ====================== +useUpdateData({ + event: 'supervisor.publish', + updateFun({ id, published }) { + + updatePublishedById(id, published); + }, +}); +//#endregion onMounted(() => { - getTableData(); + getListTreeData(); }); </script> <style scoped lang="scss"></style> -- Gitblit v1.9.3