From 18aeed6ed17a3aeacc157e0019159957aeaec556 Mon Sep 17 00:00:00 2001
From: gerson <1405270578@qq.com>
Date: 星期日, 08 九月 2024 13:40:44 +0800
Subject: [PATCH] 意向分组；编辑时更新为未发布
---
src/layout/routerView/iframes.vue | 7
src/api/supervisorAdmin/index.ts | 3
src/api/supervisorAdmin/supervisorGroup.ts | 44 +++++
src/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue | 4
src/views/login/component/account.vue | 11
src/components/tree/leftTreeByMgr.vue | 15 -
src/components/tree/leftTreeByMgr.ts | 12
src/utils/util.ts | 8
src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue | 305 +++++++++++++++++++++++++++++++++----
src/types/mitt.d.ts | 9 +
src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue | 9
11 files changed, 359 insertions(+), 68 deletions(-)
diff --git a/src/api/supervisorAdmin/index.ts b/src/api/supervisorAdmin/index.ts
index 326362e..b8673be 100644
--- a/src/api/supervisorAdmin/index.ts
+++ b/src/api/supervisorAdmin/index.ts
@@ -80,11 +80,12 @@
/**
* @summary description
*/
-export const updatePublishStatus = async (params, req: any = request) => {
+export const updatePublishStatus = async (params,extraData: ExtraConfig = {}, req: any = request) => {
return req({
url: '/admin/supervisor/update_amis_supervisor_publish',
method: 'POST',
data: params,
+ ...extraData
});
};
diff --git a/src/api/supervisorAdmin/supervisorGroup.ts b/src/api/supervisorAdmin/supervisorGroup.ts
index e69de29..d2b7d65 100644
--- a/src/api/supervisorAdmin/supervisorGroup.ts
+++ b/src/api/supervisorAdmin/supervisorGroup.ts
@@ -0,0 +1,44 @@
+import request from '/@/utils/request';
+
+/**
+ * @summary description
+ */
+export const getSupervisorGroupList = async (req: any = request) => {
+ return req({
+ url: '/admin/supervisor/get_supervisor_group_list',
+ method: 'POST',
+ });
+};
+
+/**
+ * @summary description
+ */
+export const deleteSupervisorGroup = async (params, req: any = request) => {
+ return req({
+ url: '/admin/supervisor/delete_supervisor_group',
+ method: 'POST',
+ data: params,
+ });
+};
+
+/**
+ * @summary description
+ */
+export const updateSupervisorGroup = async (params, req: any = request) => {
+ return req({
+ url: '/admin/supervisor/update_supervisor_group',
+ method: 'POST',
+ data: params,
+ });
+};
+
+/**
+ * @summary description
+ */
+export const addSupervisorGroup = async (params, req: any = request) => {
+ return req({
+ url: '/admin/supervisor/add_supervisor_group',
+ method: 'POST',
+ data: params,
+ });
+};
diff --git a/src/components/tree/leftTreeByMgr.ts b/src/components/tree/leftTreeByMgr.ts
index 69c82c1..a404623 100644
--- a/src/components/tree/leftTreeByMgr.ts
+++ b/src/components/tree/leftTreeByMgr.ts
@@ -34,9 +34,9 @@
type: Object,
default: () => {
return {
- children: 'Children',
- label: 'Name',
- id: 'ID',
+ children: 'children',
+ label: 'title',
+ id: 'id',
};
},
},
@@ -45,9 +45,9 @@
type: Object,
default: () => {
return {
- children: 'Children',
- label: 'Name',
- id: 'ID',
+ children: 'children',
+ label: 'title',
+ id: 'id',
};
},
},
diff --git a/src/components/tree/leftTreeByMgr.vue b/src/components/tree/leftTreeByMgr.vue
index 68689b4..7a121f1 100644
--- a/src/components/tree/leftTreeByMgr.vue
+++ b/src/components/tree/leftTreeByMgr.vue
@@ -113,8 +113,8 @@
:draggable="draggable || treeDraggable"
>
<template #default="{ node, data }">
- <span class="custom-tree-node">
- <span class="flex items-center" style="width: calc(100% - 20px)">
+ <span class="custom-tree-node overflow-hidden">
+ <span class="flex items-center flex-auto" >
<template v-if="showNodeIcon">
<SvgIcon v-if="nodeIcon" :name="nodeIcon(node, data)" :size="14" color="rgb(64,158,255)"> </SvgIcon>
<SvgIcon
@@ -136,7 +136,7 @@
</div>
</el-tooltip>
</span>
- <span class="flex items-center">
+ <span class="flex items-center flex-0">
<slot name="listNodeSuffix" :data="data" :node="node"></slot>
<el-dropdown v-if="typeof showMoreOperate === 'function' ? showMoreOperate(node, data) : showMoreOperate">
@@ -170,12 +170,7 @@
</el-dropdown-menu>
</template>
</el-dropdown>
- <SvgIcon
- v-if="suffixIcon"
- :size="18"
- :name="suffixIconFun(node, data).name"
- :color="suffixIconFun(node, data).color"
- ></SvgIcon>
+
</span>
</span>
</template>
@@ -242,9 +237,7 @@
flex: 1;
display: flex;
align-items: center;
- justify-content: space-between;
font-size: 14px;
- width: calc(100% - 24px);
}
:deep(.el-tree-node__content) {
diff --git a/src/layout/routerView/iframes.vue b/src/layout/routerView/iframes.vue
index 0770ef6..7281a70 100644
--- a/src/layout/routerView/iframes.vue
+++ b/src/layout/routerView/iframes.vue
@@ -26,6 +26,7 @@
import { computed, watch, ref, nextTick } from 'vue';
import { useRoute } from 'vue-router';
import AmisPageOptDlg from '/@/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue';
+import emitter from '/@/utils/mitt';
// 瀹氫箟鐖剁粍浠朵紶杩囨潵鐨勫��
const props = defineProps({
@@ -107,6 +108,12 @@
window.frames[0].openOptAmisPageDlg = () => {
amisPageShow.value = true;
};
+ window.frames[0].updatePublished = (id, published) => {
+ emitter.emit('supervisor.publish', {
+ id,
+ published,
+ });
+ };
}, 0);
};
diff --git a/src/types/mitt.d.ts b/src/types/mitt.d.ts
index 5181182..9c56446 100644
--- a/src/types/mitt.d.ts
+++ b/src/types/mitt.d.ts
@@ -1,3 +1,5 @@
+import type { SupervisorPublished } from '../views/project/yw/lowCode/sqlAmis/types';
+
/**
* mitt 浜嬩欢绫诲瀷瀹氫箟
*
@@ -68,10 +70,15 @@
};
'fault.diagnosis.event.update': {
ID?: string;
- OldCatalogID?:string;
+ OldCatalogID?: string;
CatalogID?: string;
};
+ 'supervisor.publish': {
+ id: string;
+ published: SupervisorPublished;
+ };
+
//#endregion
};
diff --git a/src/utils/util.ts b/src/utils/util.ts
index 72d1e41..8941a5f 100644
--- a/src/utils/util.ts
+++ b/src/utils/util.ts
@@ -168,9 +168,9 @@
export const convertListToTree = (
data: any[],
defaultProps = {
- ID: 'ID',
- Children: 'Children',
- ParentID: 'ParentID',
+ ID: 'id',
+ Children: 'children',
+ ParentID: 'parent',
}
) => {
if (!data || data?.length === 0) return [];
@@ -210,7 +210,7 @@
callback: (value: T, index?, array?, parent?) => any,
parent: any = null,
markParent = false,
- childrenKey = 'Children'
+ childrenKey = 'children'
) => {
if (!treeData || treeData.length === 0) return;
if (!parent) parent = treeData;
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index 9c76003..00309f0 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -209,13 +209,14 @@
const res = await PostLogin(params, {
noAuth: true,
+ loading: false,
});
-
- Local.set(accessSessionKey,res.hswatersession)
+
+ Local.set(accessSessionKey, res.hswatersession);
await useUserInfo().setUserInfos({
- userName:ruleForm.value.account,
- phoneNumber:'',
- photo:profileMan
+ userName: ruleForm.value.account,
+ phoneNumber: '',
+ photo: profileMan,
}); //缂撳瓨鐢ㄦ埛淇℃伅
state.loading.signIn = true;
if (!themeConfig.value.isRequestRoutes) {
diff --git a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue
index e36527d..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"
@@ -40,10 +55,16 @@
<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 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="published" width="85" show-overflow-tooltip>
+ <template #default="scope">
+ {{ 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">
@@ -117,48 +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 { ElMessage } from 'element-plus';
+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.update_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
@@ -226,15 +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 (published: SupervisorPublished, id, index) => {
- const res = await updatePublishStatus({
- id: id,
- publish: published,
- });
- const origin = published ? SupervisorPublished.N : SupervisorPublished.Y;
- displayTableData.value[index].published = res.publish ?? origin;
- published===SupervisorPublished.Y ? ElMessage.success('鍙戝竷鎴愬姛'):ElMessage.info('宸插彇娑堝彂甯�')
+ 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
@@ -293,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>
diff --git a/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue b/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
index 021253a..c1aa22e 100644
--- a/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
+++ b/src/views/project/yw/lowCode/sqlAmis/edit/SqlAmisEdit.vue
@@ -77,9 +77,10 @@
import * as supervisorApi from '/@/api/supervisorAdmin';
import { updateSqlApi } from '/@/api/supervisorAdmin';
import { useCompRef } from '/@/utils/types';
+import { SupervisorPublished } from '../types';
const props = defineProps(['supervisor']);
-const emit = defineEmits(['backLastPage']);
+const emit = defineEmits(['backLastPage', 'updatePublished']);
const log = console.log;
const jsonCode = ref(codeExample.jsonCode);
const dockCode = ref(codeExample.dockCode);
@@ -223,7 +224,9 @@
{
loading: false,
}
- );
+ ).then(() => {
+ emit('updatePublished', props.supervisor.id, SupervisorPublished.N);
+ });
};
const sqlCodeChange = debounce((val) => {
@@ -289,8 +292,6 @@
rsTableRef.value.setCurrentRow(configList.value[0]);
// dockRowChange(configList.value[0]);
}
-
-
if (checkRsUpdate(originConfig, configList.value)) {
// 鑷姩鏇存柊Rs
diff --git a/src/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue b/src/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue
index a1254a7..f9ca720 100644
--- a/src/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue
+++ b/src/views/project/yw/lowCode/sqlAmis/optDlg/OptDlg.vue
@@ -81,7 +81,7 @@
import { useUserInfo } from '/@/stores/userInfo';
import { storeToRefs } from 'pinia';
-const props = defineProps(['item']);
+const props = defineProps(['item', 'groupId']);
const emit = defineEmits(['update', 'insert']);
//#region ====================== 澧炲姞銆佷慨鏀硅褰曟搷浣�, dialog init======================
const isEditDialog = ref(false);
@@ -110,7 +110,7 @@
} else {
isEditDialog.value = false;
- dialogFormValue.value = { title: null, prompt: null, note: null, args: [] };
+ dialogFormValue.value = { group: props.groupId, title: null, prompt: null, note: null, args: [] };
}
};
const closeDialog = () => {
--
Gitblit v1.9.3