Oak-Team
/
oak-common-aspect
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' into release

This commit is contained in:
Xu Chang 2024-02-20 17:08:32 +08:00
parent 207e4deb88 5e5a1fbd42
commit 30dc768153
14 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
es/AspectDict.d.ts vendored
View File

@ -1,8 +1,8 @@
import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationResult } from "oak-domain/lib/types";
import { AmapInstance } from "oak-external-sdk";
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
operate: <T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];

2
es/amap.d.ts vendored
View File

@ -1,4 +1,4 @@
import { AmapInstance } from 'oak-external-sdk';
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
export declare function amap<T extends 'getDrivingPath' | 'regeo' | 'ipLoc' | 'getDistrict' | 'geocode'>(options: {
key: string;
method: T;

2
es/amap.js
View File

@ -1,4 +1,4 @@
import { AmapSDK } from 'oak-external-sdk';
import AmapSDK from 'oak-external-sdk/lib/AmapSDK';
export async function amap(options) {
const { key, method, data } = options;
const instance = AmapSDK.getInstance(key);

2
es/crud.d.ts vendored
View File

@ -5,7 +5,7 @@ export declare function operate<ED extends BaseEntityDict & EntityDict, T extend
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | import("oak-domain/lib/types").OperationResult<ED>[]>;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];

2
es/crud.js
View File

@ -9,7 +9,7 @@ export async function operate(params, context) {
throw new OakUnloggedInException();
} */
if (!context.allowUserUpdate()) {
throw new OakUserUnpermittedException('您被禁更新');
throw new OakUserUnpermittedException(entity, operation instanceof Array ? operation[0] : operation, '您被禁更新');
}
if (operation instanceof Array) {
const result = [];

4
lib/AspectDict.d.ts vendored
View File

@ -1,8 +1,8 @@
import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationResult } from "oak-domain/lib/types";
import { AmapInstance } from "oak-external-sdk";
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";
export type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
export declare type CommonAspectDict<ED extends EntityDict & BaseEntityDict, Cxt extends AsyncContext<ED>> = {
operate: <T extends keyof ED, OP extends OperateOption>(params: {
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];

2
lib/amap.d.ts vendored
View File

@ -1,4 +1,4 @@
import { AmapInstance } from 'oak-external-sdk';
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
export declare function amap<T extends 'getDrivingPath' | 'regeo' | 'ipLoc' | 'getDistrict' | 'geocode'>(options: {
key: string;
method: T;

5
lib/amap.js
View File

@ -1,10 +1,11 @@
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.amap = void 0;
const oak_external_sdk_1 = require("oak-external-sdk");
const tslib_1 = require("tslib");
const AmapSDK_1 = tslib_1.__importDefault(require("oak-external-sdk/lib/AmapSDK"));
async function amap(options) {
const { key, method, data } = options;
const instance = oak_external_sdk_1.AmapSDK.getInstance(key);
const instance = AmapSDK_1.default.getInstance(key);
const fn = instance[method];
if (!fn) {
throw new Error('method not implemented');

2
lib/crud.d.ts vendored
View File

@ -5,7 +5,7 @@ export declare function operate<ED extends BaseEntityDict & EntityDict, T extend
entity: T;
operation: ED[T]['Operation'] | ED[T]['Operation'][];
option?: OP;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | import("oak-domain/lib/types").OperationResult<ED>[]>;
}, context: Cxt): Promise<import("oak-domain/lib/types").OperationResult<ED> | Awaited<import("oak-domain/lib/types").OperationResult<ED>>[]>;
export declare function select<ED extends BaseEntityDict & EntityDict, T extends keyof ED, Cxt extends AsyncContext<ED>, OP extends SelectOption>(params: {
entity: T;
selection: ED[T]['Selection'];

2
lib/crud.js
View File

@ -12,7 +12,7 @@ async function operate(params, context) {
throw new OakUnloggedInException();
} */
if (!context.allowUserUpdate()) {
throw new types_1.OakUserUnpermittedException('您被禁更新');
throw new types_1.OakUserUnpermittedException(entity, operation instanceof Array ? operation[0] : operation, '您被禁更新');
}
if (operation instanceof Array) {
const result = [];

6
package.json
View File

@ -1,6 +1,6 @@
{
"name": "oak-common-aspect",
"version": "2.2.4",
"version": "2.2.5",
"description": "",
"author": {
"name": "XuChang"
@ -20,8 +20,8 @@
"license": "ISC",
"dependencies": {
"lodash": "^4.17.21",
"oak-domain": "^4.0.2",
"oak-external-sdk": "^2.0.3",
"oak-domain": "^4.2.0",
"oak-external-sdk": "^2.1.0",
"xlsx": "^0.18.5"
},
"devDependencies": {

2
src/AspectDict.ts
View File

@ -1,5 +1,5 @@
import { EntityDict, OperateOption, SelectOption, OperationResult, AggregationResult } from "oak-domain/lib/types";
import { AmapInstance } from "oak-external-sdk";
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
import { EntityDict as BaseEntityDict } from 'oak-domain/lib/base-app-domain';
import { AsyncContext } from "oak-domain/lib/store/AsyncRowStore";

3
src/amap.ts
View File

@ -1,4 +1,5 @@
import { AmapSDK, AmapInstance } from 'oak-external-sdk';
import AmapSDK from 'oak-external-sdk/lib/AmapSDK';
import { AmapInstance } from "oak-external-sdk/lib/service/amap/Amap";
export async function amap<T extends 'getDrivingPath' | 'regeo' | 'ipLoc' | 'getDistrict' | 'geocode'>(options: {
key: string;

2
src/crud.ts
View File

@ -31,7 +31,7 @@ export async function operate<
throw new OakUnloggedInException();
} */
if (!context.allowUserUpdate()) {
throw new OakUserUnpermittedException('您被禁更新');
throw new OakUserUnpermittedException(entity, operation instanceof Array ? operation[0] : operation, '您被禁更新');
}
if (operation instanceof Array) {