Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rel 8.2.1 #986

Merged
merged 4 commits into from
Aug 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ name: "Publish"

on:
push:
branches: [ rel-8.2.0 ]
branches: [ rel-8.2.1 ]
env:
DOTNET_VERSION: "8.0.200"

4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ name: "Tagged Release"

on:
push:
branches: [ rel-8.2.0 ]
branches: [ rel-8.2.1 ]

jobs:
tagged-release:
@@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "8.2.0"
automatic_release_tag: "8.2.1"
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<DotNetCoreCAPPackageVersion>8.1.1</DotNetCoreCAPPackageVersion>
<DotNetCoreCAPPackageVersion>8.2.0</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
<VoloAbpPackageVersion>8.2.0</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.2.0</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>8.2.1</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>8.2.1</LINGYUNAbpPackageVersion>
<MicrosoftExtensionsPackageVersion>8.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftAspNetCorePackageVersion>8.0.0</MicrosoftAspNetCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>8.0.0</MicrosoftEntityFrameworkCorePackageVersion>
6 changes: 3 additions & 3 deletions apps/vue/src/api/caching-management/cache/index.ts
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@ import {

export const getKeys = (input: GetCacheKeysRequest) => {
return defHttp.get<CacheKeys>({
url: '/api/caching-management/cache',
url: '/api/caching-management/cache/keys',
params: input,
});
};

export const getValue = (key: string) => {
return defHttp.get<CacheValue>({
url: `/api/caching-management/cache?key=${key}`,
url: `/api/caching-management/cache/value?key=${key}`,
});
};

@@ -28,6 +28,6 @@ export const refresh = (input: CacheRefreshRequest) => {

export const remove = (key: string) => {
return defHttp.delete<void>({
url: `/api/caching-management/cache?key=${key}`,
url: `/api/caching-management/cache/remove?key=${key}`,
});
};
7 changes: 5 additions & 2 deletions apps/vue/src/api/text-templating/contents/index.ts
Original file line number Diff line number Diff line change
@@ -7,9 +7,12 @@ import {
} from './model';

export const GetAsyncByInput = (input: TextTemplateContentGetInput) => {
let url = `/api/text-templating/templates/content/${input.name}`;
if (input.culture) {
url = `/api/text-templating/templates/content/${input.culture}/${input.name}`;
}
return defHttp.get<TextTemplateContentDto>({
url: `/api/text-templating/templates/content`,
params: input,
url,
});
};

Original file line number Diff line number Diff line change
@@ -17,19 +17,13 @@
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'displayName'">
<span>{{ getGroupDisplayName(record.displayName) }}</span>
<span>{{ getDisplayName(record.displayName) }}</span>
</template>
</template>
<template #expandedRowRender="{ record }">
<BasicTable @register="registerSubTable" :data-source="record.features">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'groupName'">
<span>{{ getGroupDisplayName(record.groupName) }}</span>
</template>
<template v-else-if="column.key === 'parentName'">
<span>{{ getDisplayName(record.parentName) }}</span>
</template>
<template v-else-if="column.key === 'displayName'">
<template v-if="column.key === 'displayName'">
<span>{{ getDisplayName(record.displayName) }}</span>
</template>
<template v-else-if="column.key === 'description'">
@@ -92,7 +86,6 @@
import { getList, deleteByName } from '/@/api/feature-management/definitions/features';
import { getSearchFormSchemas } from '../datas/ModalData';
import { listToTree } from '/@/utils/helper/treeHelper';
import { groupBy } from '/@/utils/array';
import { sorter } from '/@/utils/table';
import FeatureDefinitionModal from './FeatureDefinitionModal.vue';

@@ -181,14 +174,6 @@
};
});
});
const getGroupDisplayName = computed(() => {
return (groupName: string) => {
const group = state.groups.find((x) => x.name === groupName);
if (!group) return groupName;
const info = deserialize(group.displayName);
return Lr(info.resourceName, info.name);
};
});
const getDisplayName = computed(() => {
return (displayName?: string) => {
if (!displayName) return displayName;
@@ -198,8 +183,7 @@
});

onMounted(() => {
fetch();
fetchGroups();
fetchGroups().then(fetch);
});

function fetch() {
@@ -210,15 +194,14 @@
var input = form.getFieldsValue();
getList(input)
.then((res) => {
const featureGroup = groupBy(res.items, 'groupName');
const featureGroupData: FeatureGroup[] = [];
Object.keys(featureGroup).forEach((gk) => {
state.groups.forEach((group) => {
const groupData: FeatureGroup = {
name: gk,
displayName: gk,
name: group.name,
displayName: group.displayName,
features: [],
};
const featureTree = listToTree(featureGroup[gk], {
const featureTree = listToTree(res.items.filter((item) => item.groupName === group.name), {
id: 'name',
pid: 'parentName',
});
@@ -236,7 +219,7 @@
}

function fetchGroups() {
getGroupDefinitions({}).then((res) => {
return getGroupDefinitions({}).then((res) => {
state.groups = res.items;
});
}
Original file line number Diff line number Diff line change
@@ -17,16 +17,13 @@
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'displayName'">
<span>{{ getGroupDisplayName(record.displayName) }}</span>
<span>{{ getDisplayName(record.displayName) }}</span>
</template>
</template>
<template #expandedRowRender="{ record }">
<BasicTable @register="registerSubTable" :data-source="record.permissions">
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'groupName'">
<span>{{ getGroupDisplayName(record.groupName) }}</span>
</template>
<template v-else-if="column.key === 'displayName'">
<template v-if="column.key === 'displayName'">
<span>{{ getDisplayName(record.displayName) }}</span>
</template>
<template v-else-if="column.key === 'multiTenancySide'">
@@ -94,7 +91,6 @@
import { multiTenancySidesMap, providersMap } from '../../typing';
import { getSearchFormSchemas } from '../datas/ModalData';
import { listToTree } from '/@/utils/helper/treeHelper';
import { groupBy } from '/@/utils/array';
import { sorter } from '/@/utils/table';
import PermissionDefinitionModal from './PermissionDefinitionModal.vue';

@@ -180,14 +176,6 @@
};
});
});
const getGroupDisplayName = computed(() => {
return (groupName: string) => {
const group = state.groups.find((x) => x.name === groupName);
if (!group) return groupName;
const info = deserialize(group.displayName);
return Lr(info.resourceName, info.name);
};
});
const getDisplayName = computed(() => {
return (displayName?: string) => {
if (!displayName) return displayName;
@@ -197,8 +185,7 @@
});

onMounted(() => {
fetch();
fetchGroups();
fetchGroups().then(fetch);
});

function fetch() {
@@ -209,15 +196,14 @@
var input = form.getFieldsValue();
GetListAsyncByInput(input)
.then((res) => {
const permissionGroup = groupBy(res.items, 'groupName');
const permissionGroupData: PermissionGroup[] = [];
Object.keys(permissionGroup).forEach((gk) => {
state.groups.forEach((group) => {
const groupData: PermissionGroup = {
name: gk,
displayName: gk,
name: group.name,
displayName: group.displayName,
permissions: [],
};
const permissionTree = listToTree(permissionGroup[gk], {
const permissionTree = listToTree(res.items.filter((item) => item.groupName === group.name), {
id: 'name',
pid: 'parentName',
});
@@ -235,7 +221,7 @@
}

function fetchGroups() {
getGroupDefinitions({}).then((res) => {
return getGroupDefinitions({}).then((res) => {
state.groups = res.items;
});
}
Original file line number Diff line number Diff line change
@@ -15,22 +15,6 @@ export function getDataColumns(): BasicColumn[] {
defaultHidden: true,
sorter: (a, b) => sorter(a, b, 'isEnabled'),
},
{
title: L('DisplayName:MultiTenancySide'),
dataIndex: 'multiTenancySide',
align: 'left',
width: 80,
resizable: true,
sorter: (a, b) => sorter(a, b, 'multiTenancySide'),
},
{
title: L('DisplayName:Providers'),
dataIndex: 'providers',
align: 'left',
width: 80,
resizable: true,
sorter: (a, b) => sorter(a, b, 'providers'),
},
{
title: L('DisplayName:Name'),
dataIndex: 'name',
@@ -47,6 +31,22 @@ export function getDataColumns(): BasicColumn[] {
resizable: true,
sorter: (a, b) => sorter(a, b, 'displayName'),
},
{
title: L('DisplayName:MultiTenancySide'),
dataIndex: 'multiTenancySide',
align: 'left',
width: 80,
resizable: true,
sorter: (a, b) => sorter(a, b, 'multiTenancySide'),
},
{
title: L('DisplayName:Providers'),
dataIndex: 'providers',
align: 'left',
width: 80,
resizable: true,
sorter: (a, b) => sorter(a, b, 'providers'),
},
{
title: L('DisplayName:IsStatic'),
dataIndex: 'isStatic',
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'displayName'">
<span>{{ getGroupDisplayName(record.displayName) }}</span>
<span>{{ getDisplayName(record.displayName) }}</span>
</template>
</template>
<template #expandedRowRender="{ record }">
@@ -123,7 +123,6 @@
} from '/@/api/realtime/notifications/definitions/notifications';
import { NotificationDefinitionDto } from '/@/api/realtime/notifications/definitions/notifications/model';
import { getSearchFormSchemas } from '../datas/ModalData';
import { groupBy } from '/@/utils/array';
import { sorter } from '/@/utils/table';
import NotificationDefinitionModal from './NotificationDefinitionModal.vue';
import NotificationSendModal from './NotificationSendModal.vue';
@@ -209,14 +208,6 @@
};
});
});
const getGroupDisplayName = computed(() => {
return (groupName: string) => {
const group = state.groups.find((x) => x.name === groupName);
if (!group) return groupName;
const info = deserialize(group.displayName);
return Lr(info.resourceName, info.name);
};
});
const getDisplayName = computed(() => {
return (displayName?: string) => {
if (!displayName) return displayName;
@@ -226,8 +217,7 @@
});

onMounted(() => {
fetch();
fetchGroups();
fetchGroups().then(fetch);
});

function fetch() {
@@ -238,18 +228,16 @@
var input = form.getFieldsValue();
GetListAsyncByInput(input)
.then((res) => {
const definitionGroup = groupBy(res.items, 'groupName');
const definitionGroupData: NotificationGroup[] = [];
Object.keys(definitionGroup).forEach((gk) => {
state.groups.forEach((group) => {
const groupData: NotificationGroup = {
name: gk,
displayName: gk,
name: group.name,
displayName: group.displayName,
notifications: [],
};
groupData.notifications.push(...definitionGroup[gk]);
groupData.notifications.push(...res.items.filter((item) => item.groupName === group.name));
definitionGroupData.push(groupData);
});
console.log(definitionGroupData);
setTableData(definitionGroupData);
})
.finally(() => {
@@ -259,7 +247,7 @@
}

function fetchGroups() {
getGroupDefinitions({}).then((res) => {
return getGroupDefinitions({}).then((res) => {
state.groups = res.items;
});
}
Original file line number Diff line number Diff line change
@@ -267,12 +267,19 @@
const formEl = unref(formRef);
formEl?.validate().then(() => {
let input: NotificationSendDto;
let toUsers: { userId: string }[] = [];
if (state.entity.toUsers && Array.isArray(state.entity.toUsers)) {
toUsers = state.entity.toUsers.map((id) => {
return { userId: id };
});
}
if (getIsTemplate.value) {
input = {
name: state.notification!.template!,
severity: state.entity.severity,
culture: state.entity.culture,
data: state.entity.data,
toUsers: toUsers,
};
changeOkLoading(true);
sendTemplate(input)
@@ -320,6 +327,7 @@
formUser: getApplication.currentUser.userName,
createTime: formatToDateTime(new Date()),
},
toUsers: toUsers,
};
changeOkLoading(true);
send(input)
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<Version>8.2.0</Version>
<Version>8.2.1</Version>
<Copyright>colin</Copyright>
<Description>Use LINGYUN.MicroService.Templates command line</Description>
<PackAsTool>true</PackAsTool>
Loading
Loading