Merge pull request #787 from colinin/rel-7.0.2

upgrade: upgrade abp framework to 7.0.2

Author: colinin

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: "Tagged Release"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ rel-7.0.2 ]
 
 jobs:
   tagged-release:

apps/vue/src/api/text-templating/contents/index.ts

@@ -0,0 +1,46 @@
+import { defAbpHttp } from '/@/utils/http/abp';
+import {
+  TextTemplateContentDto,
+  TextTemplateContentGetInput,
+  TextTemplateRestoreInput,
+  TextTemplateContentUpdateDto
+} from './model';
+
+const remoteServiceName = 'AbpTextTemplating';
+const controllerName = 'TextTemplate';
+
+export const GetAsyncByInput = (input: TextTemplateContentGetInput) => {
+  return defAbpHttp.request<TextTemplateContentDto>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'GetAsync',
+    uniqueName: 'GetAsyncByInput',
+    params: input,
+  });
+};
+
+export const RestoreToDefaultAsyncByNameAndInput = (name: string, input: TextTemplateRestoreInput) => {
+  return defAbpHttp.request<void>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'RestoreToDefaultAsync',
+    uniqueName: 'RestoreToDefaultAsyncByNameAndInput',
+    params: {
+      name: name,
+    },
+    data: input,
+  });
+};
+
+export const UpdateAsyncByNameAndInput = (name: string, input: TextTemplateContentUpdateDto) => {
+  return defAbpHttp.request<TextTemplateContentDto>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'UpdateAsync',
+    uniqueName: 'UpdateAsyncByNameAndInput',
+    params: {
+      name: name,
+    },
+    data: input,
+  });
+};

apps/vue/src/api/text-templating/contents/model/index.ts

@@ -0,0 +1,19 @@
+export interface TextTemplateContentDto {
+  name: string;
+  content?: string;
+  culture?: string;
+}
+
+export interface TextTemplateContentGetInput {
+  name: string;
+  culture?: string;
+}
+
+export interface TextTemplateRestoreInput {
+  culture?: string;
+}
+
+export interface TextTemplateContentUpdateDto {
+  culture?: string;
+  content: string;
+}

apps/vue/src/api/text-templating/definitions/index.ts

@@ -0,0 +1,67 @@
+import { defAbpHttp } from '/@/utils/http/abp';
+import {
+  TextTemplateDefinitionDto,
+  TextTemplateDefinitionCreateDto,
+  TextTemplateDefinitionUpdateDto,
+  TextTemplateDefinitionGetListInput
+} from './model';
+
+const remoteServiceName = 'AbpTextTemplating';
+const controllerName = 'TextTemplateDefinition';
+
+export const CreateAsyncByInput = (input: TextTemplateDefinitionCreateDto) => {
+  return defAbpHttp.request<TextTemplateDefinitionDto>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'CreateAsync',
+    uniqueName: 'CreateAsyncByInput',
+    params: input,
+  });
+};
+
+export const DeleteAsyncByName = (name: string) => {
+  return defAbpHttp.request<void>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'DeleteAsync',
+    uniqueName: 'DeleteAsyncByName',
+    params: {
+      name: name,
+    },
+  });
+};
+
+export const GetByNameAsyncByName = (name: string) => {
+  return defAbpHttp.request<TextTemplateDefinitionDto>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'GetByNameAsync',
+    uniqueName: 'GetByNameAsyncByName',
+    params: {
+      name: name,
+    },
+  });
+};
+
+export const GetListAsyncByInput = (input: TextTemplateDefinitionGetListInput) => {
+  return defAbpHttp.request<PagedResultDto<TextTemplateDefinitionDto>>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'GetListAsync',
+    uniqueName: 'GetListAsyncByInput',
+    params: input,
+  });
+};
+
+export const UpdateAsyncByNameAndInput = (name: string, input: TextTemplateDefinitionUpdateDto) => {
+  return defAbpHttp.request<TextTemplateDefinitionDto>({
+    service: remoteServiceName,
+    controller: controllerName,
+    action: 'UpdateAsync',
+    uniqueName: 'UpdateAsyncByNameAndInput',
+    params: {
+      name: name,
+    },
+    data: input,
+  });
+};

apps/vue/src/api/text-templating/definitions/model/index.ts

@@ -0,0 +1,30 @@
+export interface TextTemplateDefinitionDto {
+  name: string;
+  displayName: string;
+  defaultCultureName?: string;
+  isInlineLocalized: boolean;
+  isLayout: boolean;
+  layout: string;
+  isStatic: boolean;
+  renderEngine?: string;
+}
+
+interface TextTemplateDefinitionCreateOrUpdateDto {
+  displayName: string;
+  defaultCultureName?: string;
+  isInlineLocalized: boolean;
+  isLayout: boolean;
+  layout: string;
+  isStatic: boolean;
+  renderEngine?: string;
+}
+
+export interface TextTemplateDefinitionCreateDto extends TextTemplateDefinitionCreateOrUpdateDto {
+  name: string;
+}
+
+export interface TextTemplateDefinitionUpdateDto extends TextTemplateDefinitionCreateOrUpdateDto, IHasConcurrencyStamp { }
+
+export interface TextTemplateDefinitionGetListInput extends PagedAndSortedResultRequestDto {
+  filter?: string;
+}

apps/vue/src/api/text-templating/templates/index.ts

@@ -23,15 +23,15 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useLocalization } from '/@/hooks/abp/useLocalization';
-  import { TextTemplateDefinition } from '/@/api/text-templating/templates/model';
-  import { getContent, restoreToDefault, update } from '/@/api/text-templating/templates';
+  import { TextTemplateDefinitionDto } from '/@/api/text-templating/definitions/model';
+  import { GetAsyncByInput, RestoreToDefaultAsyncByNameAndInput, UpdateAsyncByNameAndInput } from '/@/api/text-templating/contents';
   import { useAbpStoreWithOut } from '/@/store/modules/abp';
 
   const abpStore = useAbpStoreWithOut();
   const { L } = useLocalization('AbpTextTemplating');
   const { createConfirm, createMessage } = useMessage();
   const { localization } = abpStore.getApplication;
-  const textTemplateRef = ref<TextTemplateDefinition>();
+  const textTemplateRef = ref<TextTemplateDefinitionDto>();
   const buttonEnabled = computed(() => {
     const textTemplate = unref(textTemplateRef);
     if (textTemplate && textTemplate.name) {
@@ -118,7 +118,7 @@
   });
 
   function fetchDefaultContent(name: string) {
-    getContent({
+    GetAsyncByInput({
       name: name,
       culture: localization.currentCulture.name,
     }).then((res) => {
@@ -130,7 +130,7 @@
   }
 
   function handleCultureChange(setField: string, selectedValue: string) {
-    getContent({
+    GetAsyncByInput({
       name: textTemplateRef.value!.name,
       culture: selectedValue,
     }).then((res) => {
@@ -150,8 +150,7 @@
         onOk: () => {
           return new Promise((resolve, reject) => {
             const textTemplate = unref(textTemplateRef);
-            restoreToDefault({
-              name: textTemplate!.name,
+            RestoreToDefaultAsyncByNameAndInput(textTemplate!.name, {
               culture: input.baseCultureName,
             }).then(() => {
               createMessage.success(L('TemplateContentRestoredToDefault'));
@@ -170,8 +169,7 @@
     validateFields(['targetCultureName', 'targetContent']).then((input) => {
       changeOkLoading(true);
       const textTemplate = unref(textTemplateRef);
-      update({
-        name: textTemplate!.name,
+      UpdateAsyncByNameAndInput(textTemplate!.name, {
         culture: input.targetCultureName,
         content: input.targetContent,
       }).then(() => {

apps/vue/src/api/text-templating/templates/model/index.ts

@@ -33,13 +33,13 @@
   import { BasicModal, useModal, useModalInner } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useLocalization } from '/@/hooks/abp/useLocalization';
-  import { TextTemplateDefinition } from '/@/api/text-templating/templates/model';
-  import { getContent, restoreToDefault, update } from '/@/api/text-templating/templates';
+  import { TextTemplateDefinitionDto } from '/@/api/text-templating/definitions/model';
+  import { GetAsyncByInput, RestoreToDefaultAsyncByNameAndInput, UpdateAsyncByNameAndInput } from '/@/api/text-templating/contents';
   import TemplateContentCultureModal from './TemplateContentCultureModal.vue';
 
   const { L } = useLocalization('AbpTextTemplating');
   const { createConfirm, createMessage } = useMessage();
-  const textTemplateRef = ref<TextTemplateDefinition>();
+  const textTemplateRef = ref<TextTemplateDefinitionDto>();
   const buttonEnabled = computed(() => {
     const textTemplate = unref(textTemplateRef);
     if (textTemplate && textTemplate.name) {
@@ -85,7 +85,7 @@
   const [registerCultureModal, { openModal: openCultureModal }] = useModal();
 
   function fetchContent(name: string) {
-    getContent({
+    GetAsyncByInput({
       name: name,
     }).then((res) => {
       setFieldsValue(res);
@@ -104,7 +104,7 @@
       onOk: () => {
         return new Promise((resolve, reject) => {
           const textTemplate = unref(textTemplateRef);
-          restoreToDefault({ name: textTemplate!.name }).then(() => {
+          RestoreToDefaultAsyncByNameAndInput(textTemplate!.name, { }).then(() => {
             createMessage.success(L('TemplateContentRestoredToDefault'));
             fetchContent(textTemplate!.name);
             return resolve(textTemplate!.name);
@@ -120,8 +120,7 @@
     validate().then((input) => {
       changeOkLoading(true);
       const textTemplate = unref(textTemplateRef);
-      update({
-        name: textTemplate!.name,
+      UpdateAsyncByNameAndInput(textTemplate!.name, {
         content: input.content,
       }).then(() => {
         createMessage.success(L('TemplateContentUpdated'));