diff --git a/frontend/package.json b/frontend/package.json index 0fa253ac4c..0592096178 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -38,7 +38,7 @@ "@7polo/kity": "2.0.8", "@7polo/kityminder-core": "1.4.53", "@arco-design/web-vue": "^2.49.2", - "@arco-themes/vue-ms-theme-default": "^0.0.25", + "@arco-themes/vue-ms-theme-default": "^0.0.28", "@form-create/arco-design": "^3.1.22", "@types/color": "^3.0.3", "@vueuse/core": "^10.2.1", diff --git a/frontend/src/api/modules/setting/system/organizationAndProject.ts b/frontend/src/api/modules/setting/system/organizationAndProject.ts index 5476fdaa8c..2592a956eb 100644 --- a/frontend/src/api/modules/setting/system/organizationAndProject.ts +++ b/frontend/src/api/modules/setting/system/organizationAndProject.ts @@ -2,7 +2,10 @@ import MSR from '@/api/http/index'; import * as orgUrl from '@/api/requrls/setting/system/organizationAndProject'; import { TableQueryParams } from '@/models/common'; import { AddUserToOrgOrProjectParams } from '@/models/setting/systemOrg'; -import { CreateOrUpdateSystemOrgParams } from '@/models/setting/system/orgAndProject'; +import { + CreateOrUpdateSystemOrgParams, + CreateOrUpdateSystemProjectParams, +} from '@/models/setting/system/orgAndProject'; // 获取组织列表 export function postOrgTable(data: TableQueryParams) { @@ -10,7 +13,7 @@ export function postOrgTable(data: TableQueryParams) { } // 创建或修改组织 -export function createOrUpdateOrg(data: CreateOrUpdateSystemOrgParams) { +export function createOrUpdateOrg(data: CreateOrUpdateSystemOrgParams | CreateOrUpdateSystemProjectParams) { return MSR.post({ url: data.id ? orgUrl.postModifyOrgUrl : orgUrl.postAddOrgUrl, data }); } diff --git a/frontend/src/components/pure/ms-table/base-table.vue b/frontend/src/components/pure/ms-table/base-table.vue index ec2e69c410..6ac77d5581 100644 --- a/frontend/src/components/pure/ms-table/base-table.vue +++ b/frontend/src/components/pure/ms-table/base-table.vue @@ -11,8 +11,12 @@ v-bind="$attrs" :row-class="getRowClass" :selected-keys="props.selectedKeys" + :span-method="spanMethod" @selection-change="(e) => selectionChange(e, true)" > +