midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.71

package/src/libs/crud-pro/utils/MixinUtils.ts

@@ -1,285 +1,285 @@
-import { CommonException, Exceptions } from '../exceptions';
-
-const FIELD_NAME_REG_EXP = /^[a-zA-Z][0-9a-zA-Z_]+$/;
-
-const MixinUtils = {
-  isNil(obj: any): boolean {
-    return typeof obj === 'undefined' || obj === null;
-  },
-  isNotNil(obj: any): boolean {
-    return !MixinUtils.isNil(obj);
-  },
-  isEmpty(obj: any): boolean {
-    if (typeof obj === 'number') {
-      return false;
-    }
-
-    if (obj) {
-      if (typeof obj === 'string') {
-        const str = obj as string;
-        return str.length === 0;
-      }
-
-      if (Array.isArray(obj)) {
-        return obj.length === 0;
-      }
-
-      if (typeof obj === 'object') {
-        return Object.keys(obj).length === 0;
-      }
-    }
-
-    return !obj;
-  },
-
-  isNotEmpty(obj: any): boolean {
-    return !MixinUtils.isEmpty(obj);
-  },
-
-  equals(obj1: any, obj2: any): boolean {
-    return obj1 === obj2;
-  },
-
-  equalsIgnoreCase(str1: string, str2: string): boolean {
-    if (str1 && str2) {
-      const str1Upper = str1.toUpperCase();
-      const str2Upper = str2.toUpperCase();
-      return str1Upper === str2Upper;
-    }
-    return !str1 && !str2;
-  },
-
-  startsWith(str1: string, str2: string): boolean {
-    if (typeof str1 === "string" && typeof str2 === "string") {
-      return str1.startsWith(str2);
-    }
-    return false;
-  },
-
-  isValidFieldName(s: string): boolean {
-    if (MixinUtils.isEmpty(s)) {
-      return false;
-    }
-    return FIELD_NAME_REG_EXP.test(s);
-  },
-
-  isElementAllMatch(array: any, match: (e: any) => boolean): boolean {
-    for (let i = 0; i < array.length; i++) {
-      const e = array[i];
-      if (!match(e)) {
-        return false;
-      }
-    }
-    return true;
-  },
-
-  parseColumns(columns: string | string[]) {
-    return MixinUtils.parseStringArray(columns);
-  },
-
-  parseStringArray(columns: string | string[]): any[] {
-    if (!columns || columns === '*') {
-      return [];
-    }
-
-    if (typeof columns === 'string') {
-      const columnsTrim = columns.trim();
-      // JSON形式
-      if (columnsTrim.startsWith('[') && columnsTrim.endsWith(']')) {
-        return MixinUtils.parseJsonObject(columnsTrim);
-      }
-      //逗号形式
-      return columnsTrim.split(',').filter(s => {
-        return s.length > 0;
-      });
-    }
-
-    if (!Array.isArray(columns)) {
-      throw new CommonException(Exceptions.CFG_PARSE_ERROR, 'params must be an array or string');
-    }
-
-    return columns.filter(s => {
-      return !MixinUtils.isEmpty(s);
-    });
-  },
-
-  removeStringPrefix(str: string, prefix: string): string {
-    if (!str) {
-      return '';
-    }
-    if (str === prefix) {
-      return '';
-    }
-    if (str.startsWith(prefix)) {
-      return str.substring(prefix.length);
-    }
-    return str;
-  },
-  getErrorMessage(e: any) {
-    if (!e) {
-      return '';
-    }
-    const obj = {};
-    let fieldCount = 0;
-    const keys = ['code', 'message', 'errno', 'sql', 'sqlState', 'sqlMessage', 'stack'];
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      const value = e[key];
-      if (value) {
-        obj[key] = value;
-        fieldCount++;
-      }
-    }
-
-    if (fieldCount > 0) {
-      return JSON.stringify(obj);
-    }
-
-    return '' + e;
-  },
-
-  parseJsonObject(str: any): any {
-    if (!str) {
-      return null;
-    }
-
-    if (typeof str === 'object' || Array.isArray(str)) {
-      return str;
-    }
-
-    if (typeof str === 'string') {
-      str = str.trim();
-      if (str.startsWith('{') || str.startsWith('[')) {
-        try {
-          return JSON.parse(str);
-        } catch (e) {
-          return null;
-        }
-      }
-    }
-
-    return null;
-  },
-
-  /**
-   * 将数组转换成Map方便查询
-   * @param list
-   * @param getKey
-   */
-  toMap<T>(list: T[], getKey: (e: T) => string): Record<string, T> {
-    const map = {};
-    if (list && list.length) {
-      for (let i = 0; i < list.length; i++) {
-        const e = list[i];
-        const key = getKey(e);
-        map[key] = e;
-      }
-    }
-    return map;
-  },
-
-  /**
-   * 将数组转换成Map方便查询
-   * @param list
-   * @param getKey
-   */
-  toNewMap<T>(list: T[], getKey: (e: T) => string): Map<string, T> {
-    const map = new Map();
-    if (list && list.length) {
-      for (let i = 0; i < list.length; i++) {
-        const e = list[i];
-        const key = getKey(e);
-        map.set(key, e);
-      }
-    }
-    return map;
-  },
-
-  deepTravelObject(obj: any, objTravelCallback: (value, key, index, keyPath) => void, keyPath: string) {
-    if (!obj || !objTravelCallback) {
-      return;
-    }
-
-    if (typeof obj === 'object') {
-      const keys = Object.keys(obj);
-
-      for (let i = 0; i < keys.length; i++) {
-        const objKey = keys[i];
-        const keyStr = objKey;
-        const value = obj[objKey];
-        const curKeyPath = keyPath + '.' + keyStr;
-        objTravelCallback(value, keyStr, null, curKeyPath);
-        MixinUtils.deepTravelObject(value, objTravelCallback, curKeyPath);
-      }
-    }
-
-    if (Array.isArray(obj)) {
-      const collection = obj;
-      for (let i = 0; i < collection.length; i++) {
-        const value = collection[i];
-        const curKeyPath = keyPath + '[' + i + ']';
-        objTravelCallback(value, null, i, curKeyPath);
-        MixinUtils.deepTravelObject(value, objTravelCallback, curKeyPath);
-      }
-    }
-  },
-  removeEmptyAttrs(obj: any): any {
-    const result = {};
-    const keys = Object.keys(obj);
-    for (let i = 0; i < keys.length; i++) {
-      const key = keys[i];
-      const value = obj[key];
-      if (MixinUtils.isNotNil(value)) {
-        result[key] = value;
-      }
-    }
-    return result;
-  },
-
-  /**
-   * 判断集合A中，是否包含任意一个集合B中的元素
-   * @param a
-   * @param b
-   */
-  hasAny(a: string[], b: string[]): boolean {
-    const aSet = new Set(a);
-    for (let i = 0; i < b.length; i++) {
-      const bElement = b[i];
-      if (aSet.has(bElement)) {
-        return true;
-      }
-    }
-    return false;
-  },
-
-  selectNotEmpty(a: any, b: any): any {
-    if (MixinUtils.isNotEmpty(a)) {
-      return a;
-    }
-    return b;
-  },
-
-  parseValueByType(value: any, targetType: string): any {
-    if (value === undefined || value === null) {
-      return value;
-    }
-    if (targetType === 'string') {
-      return '' + value;
-    }
-    if (targetType === 'number') {
-      return Number(value);
-    }
-    if (targetType === 'boolean') {
-      return value === 1 || value === true || value === 'true';
-    }
-    if (targetType === 'array') {
-      return MixinUtils.parseStringArray(value);
-    }
-    if (targetType === 'JSONObject') {
-      return MixinUtils.parseJsonObject(value);
-    }
-    return value;
-  },
-};
-
-export { MixinUtils };
+import { CommonException, Exceptions } from '../exceptions';
+
+const FIELD_NAME_REG_EXP = /^[a-zA-Z][0-9a-zA-Z_]+$/;
+
+const MixinUtils = {
+  isNil(obj: any): boolean {
+    return typeof obj === 'undefined' || obj === null;
+  },
+  isNotNil(obj: any): boolean {
+    return !MixinUtils.isNil(obj);
+  },
+  isEmpty(obj: any): boolean {
+    if (typeof obj === 'number') {
+      return false;
+    }
+
+    if (obj) {
+      if (typeof obj === 'string') {
+        const str = obj as string;
+        return str.length === 0;
+      }
+
+      if (Array.isArray(obj)) {
+        return obj.length === 0;
+      }
+
+      if (typeof obj === 'object') {
+        return Object.keys(obj).length === 0;
+      }
+    }
+
+    return !obj;
+  },
+
+  isNotEmpty(obj: any): boolean {
+    return !MixinUtils.isEmpty(obj);
+  },
+
+  equals(obj1: any, obj2: any): boolean {
+    return obj1 === obj2;
+  },
+
+  equalsIgnoreCase(str1: string, str2: string): boolean {
+    if (str1 && str2) {
+      const str1Upper = str1.toUpperCase();
+      const str2Upper = str2.toUpperCase();
+      return str1Upper === str2Upper;
+    }
+    return !str1 && !str2;
+  },
+
+  startsWith(str1: string, str2: string): boolean {
+    if (typeof str1 === 'string' && typeof str2 === 'string') {
+      return str1.startsWith(str2);
+    }
+    return false;
+  },
+
+  isValidFieldName(s: string): boolean {
+    if (MixinUtils.isEmpty(s)) {
+      return false;
+    }
+    return FIELD_NAME_REG_EXP.test(s);
+  },
+
+  isElementAllMatch(array: any, match: (e: any) => boolean): boolean {
+    for (let i = 0; i < array.length; i++) {
+      const e = array[i];
+      if (!match(e)) {
+        return false;
+      }
+    }
+    return true;
+  },
+
+  parseColumns(columns: string | string[]) {
+    return MixinUtils.parseStringArray(columns);
+  },
+
+  parseStringArray(columns: string | string[]): any[] {
+    if (!columns || columns === '*') {
+      return [];
+    }
+
+    if (typeof columns === 'string') {
+      const columnsTrim = columns.trim();
+      // JSON形式
+      if (columnsTrim.startsWith('[') && columnsTrim.endsWith(']')) {
+        return MixinUtils.parseJsonObject(columnsTrim);
+      }
+      //逗号形式
+      return columnsTrim.split(',').filter(s => {
+        return s.length > 0;
+      });
+    }
+
+    if (!Array.isArray(columns)) {
+      throw new CommonException(Exceptions.CFG_PARSE_ERROR, 'params must be an array or string');
+    }
+
+    return columns.filter(s => {
+      return !MixinUtils.isEmpty(s);
+    });
+  },
+
+  removeStringPrefix(str: string, prefix: string): string {
+    if (!str) {
+      return '';
+    }
+    if (str === prefix) {
+      return '';
+    }
+    if (str.startsWith(prefix)) {
+      return str.substring(prefix.length);
+    }
+    return str;
+  },
+  getErrorMessage(e: any) {
+    if (!e) {
+      return '';
+    }
+    const obj = {};
+    let fieldCount = 0;
+    const keys = ['code', 'message', 'errno', 'sql', 'sqlState', 'sqlMessage', 'stack'];
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = e[key];
+      if (value) {
+        obj[key] = value;
+        fieldCount++;
+      }
+    }
+
+    if (fieldCount > 0) {
+      return JSON.stringify(obj);
+    }
+
+    return '' + e;
+  },
+
+  parseJsonObject(str: any): any {
+    if (!str) {
+      return null;
+    }
+
+    if (typeof str === 'object' || Array.isArray(str)) {
+      return str;
+    }
+
+    if (typeof str === 'string') {
+      str = str.trim();
+      if (str.startsWith('{') || str.startsWith('[')) {
+        try {
+          return JSON.parse(str);
+        } catch (e) {
+          return null;
+        }
+      }
+    }
+
+    return null;
+  },
+
+  /**
+   * 将数组转换成Map方便查询
+   * @param list
+   * @param getKey
+   */
+  toMap<T>(list: T[], getKey: (e: T) => string): Record<string, T> {
+    const map = {};
+    if (list && list.length) {
+      for (let i = 0; i < list.length; i++) {
+        const e = list[i];
+        const key = getKey(e);
+        map[key] = e;
+      }
+    }
+    return map;
+  },
+
+  /**
+   * 将数组转换成Map方便查询
+   * @param list
+   * @param getKey
+   */
+  toNewMap<T>(list: T[], getKey: (e: T) => string): Map<string, T> {
+    const map = new Map();
+    if (list && list.length) {
+      for (let i = 0; i < list.length; i++) {
+        const e = list[i];
+        const key = getKey(e);
+        map.set(key, e);
+      }
+    }
+    return map;
+  },
+
+  deepTravelObject(obj: any, objTravelCallback: (value, key, index, keyPath) => void, keyPath: string) {
+    if (!obj || !objTravelCallback) {
+      return;
+    }
+
+    if (typeof obj === 'object') {
+      const keys = Object.keys(obj);
+
+      for (let i = 0; i < keys.length; i++) {
+        const objKey = keys[i];
+        const keyStr = objKey;
+        const value = obj[objKey];
+        const curKeyPath = keyPath + '.' + keyStr;
+        objTravelCallback(value, keyStr, null, curKeyPath);
+        MixinUtils.deepTravelObject(value, objTravelCallback, curKeyPath);
+      }
+    }
+
+    if (Array.isArray(obj)) {
+      const collection = obj;
+      for (let i = 0; i < collection.length; i++) {
+        const value = collection[i];
+        const curKeyPath = keyPath + '[' + i + ']';
+        objTravelCallback(value, null, i, curKeyPath);
+        MixinUtils.deepTravelObject(value, objTravelCallback, curKeyPath);
+      }
+    }
+  },
+  removeEmptyAttrs(obj: any): any {
+    const result = {};
+    const keys = Object.keys(obj);
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+      const value = obj[key];
+      if (MixinUtils.isNotNil(value)) {
+        result[key] = value;
+      }
+    }
+    return result;
+  },
+
+  /**
+   * 判断集合A中，是否包含任意一个集合B中的元素
+   * @param a
+   * @param b
+   */
+  hasAny(a: string[], b: string[]): boolean {
+    const aSet = new Set(a);
+    for (let i = 0; i < b.length; i++) {
+      const bElement = b[i];
+      if (aSet.has(bElement)) {
+        return true;
+      }
+    }
+    return false;
+  },
+
+  selectNotEmpty(a: any, b: any): any {
+    if (MixinUtils.isNotEmpty(a)) {
+      return a;
+    }
+    return b;
+  },
+
+  parseValueByType(value: any, targetType: string): any {
+    if (value === undefined || value === null) {
+      return value;
+    }
+    if (targetType === 'string') {
+      return '' + value;
+    }
+    if (targetType === 'number') {
+      return Number(value);
+    }
+    if (targetType === 'boolean') {
+      return value === 1 || value === true || value === 'true';
+    }
+    if (targetType === 'array') {
+      return MixinUtils.parseStringArray(value);
+    }
+    if (targetType === 'JSONObject') {
+      return MixinUtils.parseJsonObject(value);
+    }
+    return value;
+  },
+};
+
+export { MixinUtils };

package/src/libs/crud-pro/utils/ModelUtils.ts

@@ -1,55 +1,60 @@
-import { SqlCfgModel } from '../models/SqlCfgModel';
-import { RequestCfgModel } from '../models/RequestCfgModel';
-import { MixinUtils } from './MixinUtils';
-import { IFuncCfgModel } from '../interfaces';
-import { DEFAULT_MAX_LIMIT } from '../defaultConfigs';
-
-const ModelUtils = {
-  getColumnList(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string[] {
-    const sqlCfgColumnList = sqlCfg.columns;
-    if (MixinUtils.isNotEmpty(sqlCfgColumnList)) {
-      return sqlCfgColumnList;
-    }
-    return reqCfg.columns;
-  },
-
-  getSqlTable(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string {
-    const s = sqlCfg.sqlTable;
-    if (MixinUtils.isNotEmpty(s)) {
-      return s;
-    }
-    return reqCfg.sqlTable;
-  },
-
-  getSqlSchema(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string {
-    const s = sqlCfg.sqlSchema;
-    if (MixinUtils.isNotEmpty(s)) {
-      return s;
-    }
-    return reqCfg.sqlSchema;
-  },
-
-  getMaxLimit(sqlCfg: SqlCfgModel, requestCfg: RequestCfgModel): number {
-    let s = sqlCfg.maxLimit;
-    if (typeof s === 'number' && s > 0) {
-      return s;
-    }
-    s = requestCfg.maxLimit;
-
-    if (typeof s === 'number' && s > 0) return s;
-
-    return DEFAULT_MAX_LIMIT;
-  },
-  checkFuncCfgValid(cfgModel: IFuncCfgModel): boolean {
-    const arr = [cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber, cfgModel.constBool, cfgModel.context, cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool];
-    for (let i = 0; i < arr.length; i++) {
-      const arrElement = arr[i];
-      if (typeof arrElement !== 'undefined') {
-        return true;
-      }
-    }
-    return false;
-  },
-};
-
-export { ModelUtils };
+import { SqlCfgModel } from '../models/SqlCfgModel';
+import { RequestCfgModel } from '../models/RequestCfgModel';
+import { MixinUtils } from './MixinUtils';
+import { IFuncCfgModel } from '../interfaces';
+import { DEFAULT_MAX_LIMIT } from '../defaultConfigs';
+
+const ModelUtils = {
+  getColumnList(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string[] {
+    const sqlCfgColumnList = sqlCfg.columns;
+    if (MixinUtils.isNotEmpty(sqlCfgColumnList)) {
+      return sqlCfgColumnList;
+    }
+    return reqCfg.columns;
+  },
+
+  getSqlTable(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string {
+    const s = sqlCfg.sqlTable;
+    if (MixinUtils.isNotEmpty(s)) {
+      return s;
+    }
+    return reqCfg.sqlTable;
+  },
+
+  getSqlSchema(sqlCfg: SqlCfgModel, reqCfg: RequestCfgModel): string {
+    const s = sqlCfg.sqlSchema;
+    if (MixinUtils.isNotEmpty(s)) {
+      return s;
+    }
+    return reqCfg.sqlSchema;
+  },
+
+  getMaxLimit(sqlCfg: SqlCfgModel, requestCfg: RequestCfgModel): number {
+    let s = sqlCfg.maxLimit;
+    if (typeof s === 'number' && s > 0) {
+      return s;
+    }
+    s = requestCfg.maxLimit;
+
+    if (typeof s === 'number' && s > 0) return s;
+
+    return DEFAULT_MAX_LIMIT;
+  },
+  checkFuncCfgValid(cfgModel: IFuncCfgModel): boolean {
+    const arr = [
+      cfgModel.functionName, cfgModel.const, cfgModel.constString, cfgModel.constNumber,
+      cfgModel.constBool, cfgModel.context,
+      cfgModel.contextAsString, cfgModel.contextAsNumber, cfgModel.contextAsBool,
+      cfgModel.executeExpressReturnObject, cfgModel.executeExpressReturnString
+    ];
+    for (let i = 0; i < arr.length; i++) {
+      const arrElement = arr[i];
+      if (typeof arrElement !== 'undefined') {
+        return true;
+      }
+    }
+    return false;
+  },
+};
+
+export { ModelUtils };