baja-lite 1.0.6 → 1.0.10

package/cjs/sqlite.d.ts

@@ -23,14 +23,11 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    execute(dbName: string, sql?: string | undefined, params?: any): Promise<{
-        affectedRows: number;
-        insertId: bigint;
-    }>;
-    pluck<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null>;
-    get<One_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<One_Row_Many_Column | null>;
-    raw<Many_Row_One_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_One_Column[]>;
-    query<Many_Row_Many_Column = any>(dbName: string, sql?: string | undefined, params?: any): Promise<Many_Row_Many_Column[]>;
+    execute(inData: Uint8Array): Promise<Uint8Array>;
+    pluck(inData: Uint8Array): Promise<Uint8Array>;
+    get(inData: Uint8Array): Promise<Uint8Array>;
+    raw(inData: Uint8Array): Promise<Uint8Array>;
+    query(inData: Uint8Array): Promise<Uint8Array>;
     initDB(dbName: string): Promise<void>;
     export(dbName: string): Promise<void>;
     restore(dbName: string): Promise<void>;

package/cjs/sqlite.js

@@ -29,15 +29,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteRemoteClass = void 0;
 const sql_1 = require("./sql");
 const sqlstring_1 = __importDefault(require("sqlstring"));
+const msgpack_1 = require("@msgpack/msgpack");
 class SqliteRemoteClass {
     constructor() {
         this.dbList = {};
     }
-    async execute(dbName, sql, params) {
+    async execute(inData) {
+        const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
+        sql_1.logger.debug(sql, params ?? '');
         try {
-            sql_1.logger.debug(sql, params ?? '');
             if (!sql) {
-                return { affectedRows: 0, insertId: 0n };
+                return (0, msgpack_1.encode)({ affectedRows: 0, insertId: 0n });
             }
             ;
             if (this.trace) {
@@ -48,7 +50,7 @@ class SqliteRemoteClass {
                 sql_1.logger.trace(result);
             }
             const { changes, lastInsertRowid } = result;
-            return { affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n };
+            return (0, msgpack_1.encode)({ affectedRows: changes, insertId: lastInsertRowid ? BigInt(lastInsertRowid) : 0n });
         }
         catch (error) {
             sql_1.logger.error(`
@@ -59,17 +61,19 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async pluck(dbName, sql, params) {
+    async pluck(inData) {
+        const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
+        sql_1.logger.debug(sql, params ?? '');
         try {
             sql_1.logger.debug(sql, params ?? '');
             if (!sql) {
-                return null;
+                return (0, msgpack_1.encode)(null);
             }
             ;
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).pluck().get(params ?? {});
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).pluck().get(params ?? {}));
         }
         catch (error) {
             sql_1.logger.error(`
@@ -80,17 +84,14 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async get(dbName, sql, params) {
+    async get(inData) {
+        const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
+        sql_1.logger.debug(sql, params ?? '');
         try {
-            sql_1.logger.debug(sql, params ?? '');
-            if (!sql) {
-                return null;
-            }
-            ;
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).get(params ?? {});
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).get(params ?? {}));
         }
         catch (error) {
             sql_1.logger.error(`
@@ -101,17 +102,18 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async raw(dbName, sql, params) {
+    async raw(inData) {
+        const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
+        sql_1.logger.debug(sql, params ?? '');
         try {
-            sql_1.logger.debug(sql, params ?? '');
             if (!sql) {
-                return [];
+                return (0, msgpack_1.encode)([]);
             }
             ;
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).raw().all(params ?? {});
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).raw().all(params ?? {}));
         }
         catch (error) {
             sql_1.logger.error(`
@@ -122,17 +124,18 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async query(dbName, sql, params) {
+    async query(inData) {
+        const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
+        sql_1.logger.debug(sql, params ?? '');
         try {
-            sql_1.logger.debug(sql, params ?? '');
             if (!sql) {
-                return [];
+                (0, msgpack_1.encode)([]);
             }
             ;
             if (this.trace) {
                 sql_1.logger.trace(sqlstring_1.default.format(sql, params));
             }
-            return this.dbList[dbName].prepare(sql).all(params ?? {});
+            return (0, msgpack_1.encode)(this.dbList[dbName].prepare(sql).all(params ?? {}));
         }
         catch (error) {
             sql_1.logger.error(`

package/cjs/test-mysql.js

@@ -34,6 +34,12 @@ AmaService2 = __decorate([
         tableName: 'ama_fuck', clz: AmaFuck2, dbType: sql_1.DBType.Mysql
     })
 ], AmaService2);
+// interface Menu {
+//     resourceid: string;
+//     resourcepid: string;
+//     resourcename: string;
+//     children: Menu[];
+// }
 async function go2() {
     await (0, boot_1.Boot)({
         Mysql: {
@@ -47,7 +53,10 @@ async function go2() {
         },
         log: 'info',
         columnMode: sql_1.ColumnMode.HUMP,
-        sqlDir: 'E:/pro/baja-lite/xml'
+        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({
@@ -99,13 +108,12 @@ async function go2() {
             //     templateResult: TemplateResult.Many
             // })
             // console.log(44, rt4);
-            // const rt5 = await service.select<string>({
-            //     sql: `SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%');SELECT seller_sku FROM ama_fuck WHERE seller_sku LIKE CONCAT(:sku, '%')`,
-            //     params: { sku: 'SellerSKU4' },
-            //     selectResult: SelectResult.Many_Row_One_Column,
-            //     multiple: true
-            // })
-            // console.log(55, rt5);
+            const rt5 = await service.select({
+                sqlId: 'test.test',
+                params: { username: '1111' },
+                selectResult: sql_1.SelectResult.RS_CS
+            });
+            console.log(55, rt5.length);
             // const rt6 = await service.stream().eq('sellerSku', 'SellerSKU1').excuteSelect({
             //     selectResult: SelectResult.Many_Row_Many_Column,
             // });
@@ -113,18 +121,18 @@ async function go2() {
             return 1;
         }
     });
-    const data = await service.select({
-        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);
+    // 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);
 }
 go2();

package/es/boot-remote.js

@@ -1,4 +1,5 @@
-import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode } from './sql';
+import { getEnums } from './enum';
+import { _primaryDB, _dao, logger, DBType, _sqlCache, _GlobalSqlOption, _defOption, SqlCache, SqliteRemote, _Hump, ColumnMode, _enums } from './sql';
 export const BootRomote = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
@@ -10,6 +11,9 @@ export const BootRomote = async function (options) {
     globalThis[_dao] = {
         [DBType.SqliteRemote]: {},
     };
+    if (options.enums) {
+        globalThis[_enums] = getEnums(options.enums);
+    }
     if (options.SqliteRemote) {
         if (typeof options.SqliteRemote.db === 'string') {
             await options.SqliteRemote.service.initDB(options.SqliteRemote.db);

package/es/boot.js

@@ -1,4 +1,5 @@
-import { _GlobalSqlOption, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
+import { getEnums } from './enum';
+import { _GlobalSqlOption, _enums, _EventBus, _defOption, logger, _sqlCache, SqlCache, _dao, DBType, _primaryDB, SqliteRemote, _fs, _path, Mysql, Sqlite, _Hump, ColumnMode } from './sql';
 export const Boot = async function (options) {
     globalThis[_GlobalSqlOption] = Object.assign({}, _defOption, options);
     globalThis[_Hump] = globalThis[_GlobalSqlOption].columnMode === ColumnMode.HUMP;
@@ -18,6 +19,9 @@ export const Boot = async function (options) {
         [DBType.SqliteRemote]: {},
         [DBType.Redis]: {}
     };
+    if (options.enums) {
+        globalThis[_enums] = getEnums(options.enums);
+    }
     if (options.Mysql) {
         const { createPool } = await import('mysql2/promise');
         if (options.Mysql['host']) {

package/es/code.js

@@ -4,6 +4,7 @@ import fs from 'fs';
 import { start } from 'repl';
 import { createPool } from 'mysql2/promise';
 import mustache from 'mustache';
+import { mkdir } from 'shelljs';
 const lxMap = {
     tinyint: "number",
     smallint: "number",
@@ -74,7 +75,10 @@ console.log(`
             "s": ["entity", "controller", "service", "sql", "module"]
         },
         "output": "{ClassName}Module",
-        "id"? : "uuidShort: true, notNull: true, uuid: true"
+        "id"? : "uuidShort: true, notNull: true, uuid: true",
+        "logicDeleteK"?: "逻辑删除字段名",
+        "logicDeleteV"?: "逻辑删除值",如果是字符串需要这样 logicDeleteV: "'0'"
+        "NotlogicDeleteV"?: "未逻辑删除值",如果是字符串需要这样 NotlogicDeleteV: "'0'"
     }
     command是生成命令，这里声明命令同时定义文件生成路径:可用下面的变量替换.同时必须有同名模板.
     路径是相对于项目根目录的
@@ -115,6 +119,8 @@ console.log(`
 
         modelName: 模块名称，可能为空字符串
         modelPath: 模块名称实际就影响访问路径，所以这里会直接拼好controller的模块访问路径，如果模块为空，则该属性就是空字符串,否则是 /模块名称/
+
+        logicDelete: 逻辑删除的查询条件，可以附加在sql条件的末尾，可能是空的
     -----
     命令 table1,table2,table3:模块名称
     table=. 表示扫描全库表
@@ -162,6 +168,7 @@ try {
                 COLUMN_COMMENT \`comment\`
             FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=? AND TABLE_NAME = ?;
         `, [configData.database, tableName]);
+        let logicDelete = '';
         const columns = result.map(r => {
             if (r.id === 1) {
                 r.id = true;
@@ -173,7 +180,6 @@ try {
             }
             else
                 delete r.notNull;
-            r.comment = `* ${r.comment ?? ''}(\`${tableName}.${r.name}\`)`;
             const fields = new Array(`type:SqlType.${r.type}`);
             if (r.length !== null) {
                 fields.push(`length:${r.length}`);
@@ -199,6 +205,14 @@ try {
             if (r.id === true && configData.id) {
                 fields.push(configData.id);
             }
+            if (r.name === configData.logicDeleteK) {
+                fields.push(`logicDelete: ${configData.logicDeleteV}`);
+                logicDelete = `AND ${r.name} = ${configData.NotlogicDeleteV}`;
+            }
+            if (r.comment) {
+                fields.push(`comment: '${r.comment}'`);
+            }
+            r.comment = r.comment ?? '';
             r.Type = lxMap[r.type];
             r.Field = `@Field({${fields.join(',')}})`;
             r.Name = r.name.replace(/_(\w)/g, (a, b) => b.toUpperCase());
@@ -206,7 +220,7 @@ try {
             return r;
         });
         conn.release();
-        return columns;
+        return { columns, logicDelete };
     }
     async function excute(command, input, modelName) {
         const tables = await getTables(input);
@@ -220,7 +234,7 @@ try {
         modelName ?? (modelName = '');
         const modelPath = modelName ? `/${modelName}/` : '';
         for (const { tableName, title } of tables) {
-            const columns = await getColumns(tableName);
+            const { columns, logicDelete } = await getColumns(tableName);
             const className = tableName.replace(/_(\w)/g, (a, b) => b.toUpperCase());
             const ClassName = className.replace(/\w/, (v) => v.toUpperCase());
             const vueName = tableName.replace(/_/g, '-');
@@ -250,7 +264,8 @@ try {
                 idNames_join: columns?.filter(i => i.id).map(i => i.name).join(','),
                 IdNames_join: columns?.filter(i => i.id).map(i => i.Name).join(','),
                 modelName,
-                modelPath
+                modelPath,
+                logicDelete
             };
             const template = templates[command];
             if (!template) {
@@ -261,13 +276,13 @@ try {
             const fileName = configData.command[command].replace(/{([a-zA-Z]+)}/g, (a, b) => data[b]);
             const filePath = path.join(basepath, fileName);
             const dirname = path.dirname(filePath);
-            try {
-                fs.statSync(dirname);
-            }
-            catch (error) {
-                fs.mkdirSync(dirname);
-                console.info(`[生成] ${dirname}`);
-            }
+            mkdir('-p', dirname);
+            // try {
+            //     fs.statSync(dirname);
+            // } catch (error) {
+            //     fs.mkdirSync(dirname);
+            //     console.info(`[生成] ${dirname}`);
+            // }
             try {
                 fs.statSync(filePath);
                 if (force === false) {

package/es/convert-xml.js

@@ -1,3 +1,4 @@
+import LGet from 'lodash.get';
 export const convert = function (childrens, param, parentIds, myBatisMapper) {
     let statement = '';
     for (let i = 0, children; children = childrens[i]; i++) {
@@ -5,9 +6,8 @@ export const convert = function (childrens, param, parentIds, myBatisMapper) {
         statement += convertChildren(children, param, parentIds, myBatisMapper);
     }
     // Check not converted Parameters
-    var regexList = ['\\#{\\S*}', '\\${\\S*}'];
-    for (var i = 0, regexString; regexString = regexList[i]; i++) {
-        var regex = new RegExp(regex, 'g');
+    const regexList = ['\\#{\\S*}', '\\${\\S*}'];
+    for (let i = 0, regexString; regexString = regexList[i]; i++) {
         var checkParam = statement.match(regexString);
         if (checkParam != null && checkParam.length > 0) {
             throw new Error("Parameter " + checkParam.join(",") + " is not converted.");
@@ -86,7 +86,7 @@ const convertParametersInner = function (change, convertString, param) {
         for (let i = 0; i < _stringTarget.length; i++) {
             target = _stringTarget[i];
             const t = target.replace(change + '{', '').replace('}', '');
-            let tempParamKey = eval('param.' + t);
+            let tempParamKey = LGet(param, t);
             if (tempParamKey !== undefined) {
                 const reg = new RegExp('\\' + change + '{' + t + '}', 'g');
                 if (tempParamKey === null) {

package/es/enum.d.ts

@@ -8,3 +8,11 @@ export declare class Enum {
     desc(): string;
     config(): string[];
 }
+export type EnumMap = Record<string, Enum>;
+export type GlobalArray = Record<string, Array<[string, string]>>;
+export type GlobalMap = Record<string, Record<string, string>>;
+export interface EnmuJson {
+    GlobalArray: GlobalArray;
+    GlobalMap: GlobalMap;
+}
+export declare const getEnums: (GlobalValues?: EnumMap) => EnmuJson;

package/es/enum.js

@@ -1,3 +1,4 @@
+import { _enums } from "./sql";
 export class Enum {
     constructor(value, desc, ...config) {
         this._value = value;
@@ -26,3 +27,33 @@ export class Enum {
         return this._config;
     }
 }
+let configData = null;
+export const getEnums = (GlobalValues) => {
+    if (!GlobalValues) {
+        return globalThis[_enums];
+    }
+    if (configData) {
+        return configData;
+    }
+    const result = {
+        GlobalArray: {},
+        GlobalMap: {}
+    };
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    Object.keys(GlobalValues).forEach((item) => {
+        // const guess = /([\w\W]+)_([^_]+)$/.exec(item);
+        const guess = item.replace(new RegExp(`_${GlobalValues[item].value()}`, 'i'), '');
+        if (guess) {
+            if (!result.GlobalArray[guess]) {
+                result.GlobalArray[guess] = [];
+            }
+            result.GlobalArray[guess].push([GlobalValues[item].value(), GlobalValues[item].desc()]);
+            if (!result.GlobalMap[guess]) {
+                result.GlobalMap[guess] = {};
+            }
+            result.GlobalMap[guess][GlobalValues[item].value()] = GlobalValues[item].desc();
+        }
+    });
+    configData = result;
+    return result;
+};

package/es/fn.js

@@ -85,55 +85,65 @@ export function excuteSplit(sync, datas, fn, { everyLength = 0, groupCount = 0,
     const list = arraySplit(datas, ps);
     if (sync === ExcuteSplitMode.AsyncTrust) {
         return new Promise(async (resolve, reject) => {
-            const reasons = [];
-            if (settled) {
-                const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
-                for (const item of result) {
-                    if (item.status === 'rejected') {
-                        reject(item.reason);
+            try {
+                const reasons = [];
+                if (settled) {
+                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    for (const item of result) {
+                        if (item.status === 'rejected') {
+                            reject(item.reason);
+                        }
+                        else {
+                            reasons.push(item.value);
+                        }
                     }
-                    else {
-                        reasons.push(item.value);
+                }
+                else {
+                    for (let i = 0; i < list.length; i++) {
+                        const startIndex = (i - 1) * ps.everyLength;
+                        const endIndex = startIndex + list[i].length - 1;
+                        reasons.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
                     }
                 }
+                resolve(reasons);
             }
-            else {
-                for (let i = 0; i < list.length; i++) {
-                    const startIndex = (i - 1) * ps.everyLength;
-                    const endIndex = startIndex + list[i].length - 1;
-                    reasons.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
-                }
+            catch (error) {
+                reject(error);
             }
-            resolve(reasons);
         });
     }
     else if (sync === ExcuteSplitMode.AsyncNoTrust) {
         return new Promise(async (resolve, reject) => {
-            const reasons = { result: [], error: [] };
-            if (settled) {
-                const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
-                for (const item of result) {
-                    if (item.status === 'rejected') {
-                        reasons.error.push(item.reason);
-                    }
-                    else {
-                        reasons.result.push(item.value);
+            try {
+                const reasons = { result: [], error: [] };
+                if (settled) {
+                    const result = await Promise.allSettled(list.map((list, i) => fn(list, i, list.length, extendParams[i])));
+                    for (const item of result) {
+                        if (item.status === 'rejected') {
+                            reasons.error.push(item.reason);
+                        }
+                        else {
+                            reasons.result.push(item.value);
+                        }
                     }
                 }
-            }
-            else {
-                for (let i = 0; i < list.length; i++) {
-                    const startIndex = (i - 1) * ps.everyLength;
-                    const endIndex = startIndex + list[i].length - 1;
-                    try {
-                        reasons.result.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
-                    }
-                    catch (error) {
-                        reasons.error.push(error);
+                else {
+                    for (let i = 0; i < list.length; i++) {
+                        const startIndex = (i - 1) * ps.everyLength;
+                        const endIndex = startIndex + list[i].length - 1;
+                        try {
+                            reasons.result.push(await fn(list[i], i, list.length, extendParams[i], startIndex, endIndex));
+                        }
+                        catch (error) {
+                            reasons.error.push(error);
+                        }
                     }
                 }
+                resolve(reasons);
+            }
+            catch (error) {
+                reject(error);
             }
-            resolve(reasons);
         });
     }
     else if (sync === ExcuteSplitMode.SyncTrust) {

package/es/list.js

@@ -30,3 +30,27 @@ export class ArrayList extends Array {
         this.splice(index, 1);
     }
 }
+// export class ArrayMap<T> extends Array<T> {
+//     private _map: Map<string, T> = new Map();
+//     private key: keyof T;
+//     constructor(key: keyof T, array?: Array<T> | T | undefined) {
+//         super();
+//         this.key = key;
+//         if (array instanceof Array) {
+//             super.push(...array);
+//         } else if (typeof array !== 'undefined') {
+//             super.push(array);
+//         }
+//     }
+//     override push(...items: T[]): number {
+//         for (const item of items) {
+//             const key = item[this.key] as string;
+//             if (!this._map.has(key)) {
+//                 super.push(item);
+//                 this._map.set(key, item);
+//             }
+//         }
+//         return this.length;
+//     }
+//     override
+// }

package/es/math.d.ts

@@ -67,3 +67,17 @@ export declare class Bus {
 }
 export declare const calc: (result: any) => Bus;
 export declare const getGeo: (p1: Point, p2: Point) => number;
+/**
+ * 十进制转换自定义进制
+ * @param from 数字
+ * @param to 自定义进制的字符
+ * @returns
+ */
+export declare function ten2Any(from: number, to?: string): string;
+/**
+ * 自定义进制转换十进制
+ * @param from
+ * @param to
+ * @returns
+ */
+export declare function any2Ten(from: string, to?: string): number;

package/es/math.js

@@ -412,3 +412,40 @@ export const getGeo = (p1, p2) => {
     p2.long = calc(p2.longitude).mul(Math.PI).div(180).over();
     return calc(Math.round(mul(Math.asin(Math.sqrt(add(Math.pow(Math.sin(div(sub(p1.lat, p2.lat), 2)), 2), mul(Math.cos(p1.lat), Math.cos(p2.lat), Math.pow(Math.sin(div(sub(p1.long, p2.long), 2)), 2))))), 2, 6378.137, 10000))).div(10000).round(2).over();
 };
+const ZM = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+/**
+ * 十进制转换自定义进制
+ * @param from 数字
+ * @param to 自定义进制的字符
+ * @returns
+ */
+export function ten2Any(from, to = ZM) {
+    let result = '';
+    const length = to.length;
+    while (from > 0) {
+        from--;
+        let remainder = from % length;
+        result = to.charAt(remainder) + result;
+        from = Math.floor(from / length);
+    }
+    return result;
+}
+/**
+ * 自定义进制转换十进制
+ * @param from
+ * @param to
+ * @returns
+ */
+export function any2Ten(from, to = ZM) {
+    let decimal = 0;
+    from = from.toUpperCase();
+    for (let i = 0; i < from.length; i++) {
+        const char = from[from.length - 1 - i].toUpperCase();
+        const index = to.indexOf(char);
+        if (index > -1) {
+            const value = to.indexOf(char) + 1;
+            decimal += value * Math.pow(26, i);
+        }
+    }
+    return decimal;
+}