baja-lite 1.2.1 → 1.3.1

package/test-mysql.js

@@ -7,129 +7,103 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { Field, SqlType } from 'baja-lite-field';
 import 'reflect-metadata';
 import { Boot } from './boot.js';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
-class AmaFuck2 {
+import { ColumnMode, DB, SqlService } from './sql.js';
+class BaseAuditUser {
 }
 __decorate([
-    Field({ type: SqlType.varchar, length: 200, id: true, uuid: true }),
+    Field({ type: SqlType.varchar, length: 32, id: true, notNull: true, uuidShort: true }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "site", void 0);
+], BaseAuditUser.prototype, "auditId", void 0);
 __decorate([
-    Field({ type: SqlType.varchar, length: 200, def: '333' }),
+    Field({ type: SqlType.varchar, length: 32, comment: '密码' }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "sellerSku2", void 0);
+], BaseAuditUser.prototype, "password", void 0);
 __decorate([
-    Field({ type: SqlType.varchar, length: 200 }),
+    Field({ type: SqlType.varchar, length: 255, comment: '省' }),
     __metadata("design:type", String)
-], AmaFuck2.prototype, "sellerSku", void 0);
-let AmaService2 = class AmaService2 extends SqlService {
+], BaseAuditUser.prototype, "userProvinceCode", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 255, comment: '省' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "userProvince", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32, comment: '显示名称' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "labelName", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32, comment: '备注名称' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "remarkName", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32, comment: '初始密码' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "upassword", void 0);
+__decorate([
+    Field({ type: SqlType.char, length: 1, def: 0, comment: '是否中心' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "baseType", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32 }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "userId", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32 }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "companyId", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 32 }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "username", void 0);
+__decorate([
+    Field({ type: SqlType.char, length: 1, def: 0, comment: '状态' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "userStatus", void 0);
+__decorate([
+    Field({ type: SqlType.char, length: 1, def: 0, comment: '账户分组' }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "groupId", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 10 }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "startDate", void 0);
+__decorate([
+    Field({ type: SqlType.varchar, length: 10 }),
+    __metadata("design:type", String)
+], BaseAuditUser.prototype, "endDate", void 0);
+let BaseAuditUserService = class BaseAuditUserService extends SqlService {
 };
-AmaService2 = __decorate([
-    DB({
-        tableName: 'ama_fuck', clz: AmaFuck2, dbType: DBType.Mysql
-    })
-], AmaService2);
-// interface Menu {
-//     resourceid: string;
-//     resourcepid: string;
-//     resourcename: string;
-//     children: Menu[];
-// }
+BaseAuditUserService = __decorate([
+    DB({ tableName: 'base_audit_user', clz: BaseAuditUser })
+], BaseAuditUserService);
 export async function go2() {
     await Boot({
         Mysql: {
-            host: '39.98.58.252',
-            port: 3308,
+            host: '127.0.0.1',
+            port: 3306,
             user: 'root',
-            password: 'Eme!2#456$&*',
+            password: 'abcd1234',
             // 数据库名
-            database: 'dmce',
+            database: 'sportevent',
             debug: false
         },
-        log: 'info',
+        log: 'trace',
         columnMode: ColumnMode.HUMP,
         sqlDir: 'E:/pro/baja-lite/xml',
         sqlMap: {
             ['test.test']: `SELECT * FROM cp_user {{#username}} WHERE username = :username {{/username}}`
         }
     });
-    const service = new AmaService2();
-    await service.transaction({
+    const service = new BaseAuditUserService();
+    const list = await service.transaction({
         fn: async (conn) => {
-            // const list = new Array<AmaFuck2>({
-            //     sellerSku: 'SellerSKU1',
-            // }, {
-            //     sellerSku: 'sellerSku1',
-            //     sellerSku2: 'SellerSKU11',
-            // }, {
-            //     sellerSku2: 'SellerSKU2',
-            //     sellerSku: 'SellerSKU22',
-            // }, {
-            //     sellerSku2: 'SellerSKU3',
-            //     sellerSku: 'SellerSKU33',
-            // }, {
-            //     sellerSku2: '',
-            //     sellerSku: 'SellerSKU44',
-            //     site: '1234'
-            // });
-            // const rt = await service.insert({
-            //     data: list,
-            //     conn,
-            //     // skipEmptyString: false,
-            //     // skipUndefined: false
-            //     mode: InsertMode.InsertWithTempTable,
-            //     existConditionOtherThanIds: ['sellerSku']
-            // });
-            // console.log(11, rt);
-            // const rt2 = await service.update({
-            //     data: {
-            //         sellerSku: 'SellerSKU1',
-            //         sellerSku2: 'SellerSKU21',
-            //         site: 'site1'
-            //     },
-            //     conn, skipEmptyString: false
-            // });
-            // console.log(22, rt2);
-            // const rt3 = await service.delete({
-            //     where: [
-            //         { sellerSku2: 'SellerSKU23', sellerSku: 'SellerSKU3' }
-            //     ],
-            //     mode: DeleteMode.TempTable,
-            //     conn
-            // });
-            // console.log(33, rt3);
-            // const rt4 = await service.template({
-            //     where: { sellerSku2: 'SellerSKU22', sellerSku: 'sellerSku2' },
-            //     templateResult: TemplateResult.Many
-            // })
-            // console.log(44, rt4);
-            const rt5 = await service.select({
-                sqlId: 'test.test',
-                params: { username: '1111' },
-                selectResult: SelectResult.RS_CS
-            });
-            console.log(55, rt5.length);
-            // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
-            //     selectResult: SelectResult.Many_Row_Many_Column,
-            // });
-            // console.log(66, rt6);
-            return 1;
+            await service.stream().eq('baseType', '0').in('auditId', ['162400829591265280', '162201628882247680']).excuteSelect();
+            const data = await service.stream().in('auditId', ['162400829591265280', '162201628882247680']).update('labelName', '333').excuteUpdate({ conn });
+            return data;
         }
     });
-    // const data = await service.select<Menu>({
-    //     sql: 'SELECT resourceid, resourcepid,resourcename FROM cp_resource ',
-    //     params: {
-    //         site: '1234',
-    //         matchInfo: { reportType: 'yyyy', id: '11' }
-    //     },
-    //     // mapper: [
-    //     //     ['site', ['info', 'bSist'], 989],
-    //     //     ['site', ['info2', 'bSist'], 33],
-    //     //     ['site', ['Bsite'], 0]
-    //     // ]
-    // });
-    // console.log(data);
+    console.log(11, list);
 }
 go2();

package/test-postgresql.js

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { DBType, Field, SqlType } from 'baja-lite-field';
 import 'reflect-metadata';
 import { Boot } from './boot.js';
-import { SqlService, Field, DB, DBType, SqlType, ColumnMode, SelectResult, } from './sql.js';
+import { ColumnMode, DB, SelectResult, SqlService, } from './sql.js';
 class AmaFuck2 {
 }
 __decorate([

package/test-sqlite.js

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { DBType, Field, SqlType } from 'baja-lite-field';
 import 'reflect-metadata';
 import { Boot } from './boot';
-import { SqlService, Field, SqlType, DB, DBType, SyncMode, DeleteMode, InsertMode } from './sql';
+import { DB, DeleteMode, InsertMode, SqlService, SyncMode } from './sql';
 class AmaFuck {
 }
 __decorate([

package/validate.d.ts

@@ -0,0 +1,170 @@
+type Patter = {
+    'upper-letter': patter;
+    'lower-letter': patter;
+    letter: patter;
+    'letter-2': patter;
+    chinese: patter;
+    zonecode: patter;
+    qq: patter;
+    wechat: patter;
+    email: patter;
+    mobile: patter;
+    tel: patter;
+    allphone: patter;
+    license: patter;
+    organ: patter;
+    bank: patter;
+    float: patter;
+    string: patter;
+    plus: patter;
+    'plus-int': patter;
+    'plus-float': patter;
+    minus: patter;
+    'minus-int': patter;
+    'minus-float': patter;
+    'un-plus': patter;
+    'un-plus-int': patter;
+    'un-plus-float': patter;
+    'un-minus': patter;
+    'un-minus-int': patter;
+    'un-minus-float': patter;
+    'id-card': patter;
+    number: patter;
+    number2: patter;
+    int: patter;
+    price: patter;
+    'price-2': patter;
+    'price-3': patter;
+    'price-4': patter;
+    'price-5': patter;
+    'rebate-1': patter;
+    'rebate-10': patter;
+    'rebate-100': patter;
+    url: patter;
+    post: patter;
+};
+export interface ValidateProps {
+    label?: string;
+    prop?: string;
+    required?: boolean;
+    mkType?: 'string' | 'number' | 'boolean';
+    mkRealProp?: string | (() => string);
+    mkLabel?: string;
+    mkTrigger?: 'blur' | 'change';
+    mkEq?: string | number | (() => string | number);
+    mkNe?: string | number | (() => string | number);
+    mkLt?: string | number | (() => string | number);
+    mkLe?: string | number | (() => string | number);
+    mkGe?: string | number | (() => string | number);
+    mkGt?: string | number | (() => string | number);
+    mkEqProp?: string | (() => string);
+    mkNeProp?: string | (() => string);
+    mkLtProp?: string | (() => string);
+    mkLeProp?: string | (() => string);
+    mkGeProp?: string | (() => string);
+    mkGtProp?: string | (() => string);
+    mkEqLength?: number | (() => number);
+    mkNeLength?: number | (() => number);
+    mkLtLength?: number | (() => number);
+    mkLeLength?: number | (() => number);
+    mkGeLength?: number | (() => number);
+    mkGtLength?: number | (() => number);
+    mkEqLengthProp?: string | (() => string);
+    mkNeLengthProp?: string | (() => string);
+    mkLtLengthProp?: string | (() => string);
+    mkLeLengthProp?: string | (() => string);
+    mkGeLengthProp?: string | (() => string);
+    mkGtLengthProp?: string | (() => string);
+    mkEnum?: string[] | (() => string[]);
+    mkInlay?: keyof Patter;
+    mkPattern?: RegExp;
+    mkCustom?: <T>(value: any, prop?: string, form?: T) => Promise<Error | null>;
+    mkTrim?: boolean;
+    mkIdCard?: boolean;
+}
+export declare class ValidateItem<FormType> {
+    private props;
+    private data;
+    private value;
+    constructor(validItem: ValidateProps, data: FormType);
+    get length(): number;
+    get realLabel(): string;
+    get emptyValue(): boolean;
+    myValue(): any;
+    isEmptyValue(vl: any): boolean;
+    getLength(vl: any): number;
+    valueConvert(value: any): any;
+    getValue(key: any): any;
+    getProp(prop: any): any;
+    getValueLength(key: any): number;
+    getPropLength(prop: any): number;
+    patternFn(value: any, [ms, p]: patter): void;
+    required(): Promise<void>;
+    mkEnum(): Promise<void>;
+    mkInlay(): Promise<void>;
+    mkPattern(): Promise<void>;
+    mkCustom(): Promise<Error | null>;
+    mkEq(): Promise<void>;
+    mkNe(): Promise<void>;
+    mkLt(): Promise<void>;
+    mkLe(): Promise<void>;
+    mkGt(): Promise<void>;
+    mkGe(): Promise<void>;
+    mkEqProp(): Promise<void>;
+    mkNeProp(): Promise<void>;
+    mkLtProp(): Promise<void>;
+    mkLeProp(): Promise<void>;
+    mkGtProp(): Promise<void>;
+    mkGeProp(): Promise<void>;
+    mkEqLength(): Promise<void>;
+    mkNeLength(): Promise<void>;
+    mkLtLength(): Promise<void>;
+    mkLeLength(): Promise<void>;
+    mkGtLength(): Promise<void>;
+    mkGeLength(): Promise<void>;
+    mkEqLengthProp(): Promise<void>;
+    mkNeLengthProp(): Promise<void>;
+    mkLtLengthProp(): Promise<void>;
+    mkLeLengthProp(): Promise<void>;
+    mkGtLengthProp(): Promise<void>;
+    mkGeLengthProp(): Promise<void>;
+    mkIdCard(): Promise<void>;
+    element(): {
+        validator: (_rule: any, value: any, callback: (e?: Error) => void, _source: any, _op: any) => void;
+        trigger: "blur" | "change" | undefined;
+    }[];
+    wot(): {
+        required: boolean | undefined;
+        validator: (val: any) => Promise<unknown[]>;
+    }[];
+    service(): Promise<void>;
+}
+export declare class ValidateForm<FormType> {
+    private valids;
+    constructor(valids: ValidForm<FormType>, data: FormType);
+    element(): {
+        [k: string]: {
+            validator: (_rule: any, value: any, callback: (e?: Error) => void, _source: any, _op: any) => void;
+            trigger: "blur" | "change" | undefined;
+        }[];
+    };
+    wot(): {
+        [k: string]: {
+            required: boolean | undefined;
+            validator: (val: any) => Promise<unknown[]>;
+        }[];
+    };
+    service(): Promise<void>;
+}
+type Paths<T, ParentPath extends string = ''> = {
+    [K in keyof T]: T[K] extends Record<string, any> | Array<any> ? ParentPath extends '' ? Paths<T[K], `${K & string}`> : `${ParentPath}.${Paths<T[K], K & string>}` : ParentPath extends '' ? K & string : `${ParentPath}.${K & string}`;
+}[keyof T];
+type ArrayPaths<T, ParentPath extends string> = T extends Array<infer U> ? U extends Record<string, any> ? `${ParentPath}.${number}` | `${ParentPath}.${number}.${Paths<U>}` : `${ParentPath}.${number}` : never;
+type AllPaths<T> = T extends Record<string, any> ? {
+    [K in keyof T]: T[K] extends Array<infer U> ? `${K & string}` | ArrayPaths<T[K], K & string> : T[K] extends Record<string, any> ? `${K & string}` | `${K & string}.${Paths<T[K]>}` : `${K & string}`;
+}[keyof T] : never;
+type ValidForm<FormType> = Partial<{
+    [K in AllPaths<FormType>]: ValidateProps;
+}>;
+type patter = [string, RegExp];
+export {};