@@ -134,6 +134,7 @@ import { onlyMessage } from '@/utils/comm';
import Template from '@/api/notice/template';
import { variableMap } from '../../data';
import { cloneDeep } from 'lodash-es';
+import { isNoCommunity } from "@/utils/utils";
type GrantType = {
role: {
@@ -169,14 +170,20 @@ const props = defineProps({
},
});
-const stepList = [
+const stepList = isNoCommunity ? [
'选择通知方式',
'选择通知配置',
'选择通知模板',
'配置模板变量',
'配置用户权限',
'完成',
-];
+] : [
+ '选择通知方式',
+ '选择通知配置',
+ '选择通知模板',
+ '配置模板变量',
+ '完成',
+]
const current = ref
(0);
const variable = ref([]);
const formModel = reactive<{
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index 3a92d2cb..12fb384d 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -93,6 +93,7 @@ const rowSelection = {
// }
// },
onChange: (keys: string[], _data: any[]) => {
+ console.log(keys,'keys')
const _keys = _data.map(i => i.id)
// 当前节点表格数据id
const currenTableKeys = _tableData.value.map((m: any) => m.id);
@@ -113,17 +114,18 @@ const rowSelection = {
emits('update:selectedRowKeys', [...otherSelectedKeys, ..._keys]);
// 新增选中/取消选中的数据
- const changed = {};
- [...addKeys, ...removeKeys].forEach((key: string) => {
- changed[key] = _tableData.value.find((f: any) => f.id === key);
- });
- if (props.mode === 'appManger') {
- // 缓存当前表格和其他表格改变的数据
- emits('update:changedApis', {
- ...department.changedApis,
- ...changed,
- });
- }
+ // const changed = {};
+ // [...addKeys, ...removeKeys].forEach((key: string) => {
+ // changed[key] = _tableData.value.find((f: any) => f.id === key);
+ // });
+ // console.log(department.changedApis,'123')
+ // if (props.mode === 'appManger') {
+ // // 缓存当前表格和其他表格改变的数据
+ // emits('update:changedApis', {
+ // ...department.changedApis,
+ // ...changed,
+ // });
+ // }
},
selectedRowKeys: ref([]),
};
@@ -133,7 +135,6 @@ const save = async () => {
const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key));
// 新选中的key
const addKeys = keys.filter((key) => !props.sourceKeys.includes(key));
-
if (props.mode === 'api') {
// 此时是api配置
// removeKeys.length &&
@@ -156,23 +157,33 @@ const save = async () => {
return
}
} else if (props.mode === 'appManger') {
- const removeItems = removeKeys.map((key) => ({
+ const items = props.selectedRowKeys.map((key)=>({
id: key,
- permissions: props.changedApis[key]?.security?props.changedApis[key]?.security:[],
- }));
- const addItems = addKeys.map((key) => ({
- id: key,
- permissions: props.changedApis[key]?.security?props.changedApis[key]?.security:[],
- }));
- Promise.all([
- updateOperations_api(code, '_delete', { operations: removeItems }),
- updateOperations_api(code, '_add', { operations: addItems }),
- ]).then((resps) => {
- if (resps[0].status === 200 && resps[1].status === 200) {
+ permissions: department.changedApis[key]?.security ? department.changedApis[key]?.security : []
+ }))
+ // const removeItems = removeKeys.map((key) => ({
+ // id: key,
+ // permissions: props.changedApis[key]?.security ? props.changedApis[key]?.security:[],
+ // }));
+ // const addItems = addKeys.map((key) => ({
+ // id: key,
+ // permissions: props.changedApis[key]?.security ? props.changedApis[key]?.security:[],
+ // }));
+ // Promise.all([
+ // updateOperations_api(code, '_delete', { operations: removeItems }),
+ // updateOperations_api(code, '_add', { operations: addItems }),
+ // ]).then((resps) => {
+ // if (resps[0].status === 200 && resps[1].status === 200) {
+ // onlyMessage('操作成功');
+ // emits('refresh');
+ // }
+ // });
+ updateOperations_api(code,{operations:items}).then((resp)=>{
+ if(resp.status === 200){
onlyMessage('操作成功');
- emits('refresh');
+ emits('refresh')
}
- });
+ })
}
};
diff --git a/src/views/system/Platforms/Api/components/LeftTree.vue b/src/views/system/Platforms/Api/components/LeftTree.vue
index cacbeb59..f822c15a 100644
--- a/src/views/system/Platforms/Api/components/LeftTree.vue
+++ b/src/views/system/Platforms/Api/components/LeftTree.vue
@@ -28,7 +28,9 @@ import {
getTreeTwo_api,
} from '@/api/system/apiPage';
import type { modeType, treeNodeTpye } from '../typing';
+import { useDepartmentStore } from '@/store/department';
+const department = useDepartmentStore();
const emits = defineEmits(['select']);
const props = defineProps<{
mode: modeType;
@@ -78,12 +80,41 @@ const getTreeData = () => {
}
treeData.value = tree;
+ const apis = {}
+ const table: any = dealTreeData(tree)
+ table.forEach((item:any)=>{
+ apis[item.id] = item
+ })
+ department.setChangedApis(apis);
})
.finally(() => {
spinning.value = false;
});
});
};
+const dealTreeData = (tree:Array) =>{
+ let table:any = []
+ tree.forEach((item)=>{
+ if(item?.children){
+ item?.children.forEach(i=>{
+ i?.apiList?.forEach((apiItem:any)=>{
+ const { method, url } = apiItem as any;
+ for (const key in method) {
+ if (Object.prototype.hasOwnProperty.call(method, key)) {
+ table.push({
+ ...method[key],
+ url,
+ method: key,
+ id: method[key].operationId,
+ });
+ }
+ }
+ })
+ })
+ }
+ })
+ return table
+}
const clickSelectItem: TreeProps['onSelect'] = (key: any[], node: any) => {
if (key[0] === 'home') return emits('select', node.node.dataRef, {});
diff --git a/vite.config.ts b/vite.config.ts
index aa56157b..80ead348 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -97,6 +97,7 @@ export default defineConfig(({ mode}) => {
// target: 'http://192.168.32.163:8844', //张季本地
// target: 'http://120.77.179.54:8844', // 120测试
target: 'http://192.168.33.46:8844', // 本地开发环境
+ // target: 'http://192.168.33.1:8845', // 社区版开发环境
// target: 'http://192.168.32.5:8848', // 刘本地
ws: 'ws://192.168.33.46:8844',
changeOrigin: true,