@ningboyz/types 1.8.45 → 1.8.47

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ningboyz/types",
   "type": "module",
-  "version": "1.8.45",
+  "version": "1.8.47",
   "private": false,
   "description": "宁波甬政类型库",
   "author": "nbyt-syq",

package/src/core/IDictResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import { construct, destruct } from "@aximario/json-tree";
 import _ from "lodash";
 import { type IBaseResponse, TBaseResponse } from "../base/IBaseResponse";
@@ -175,7 +176,7 @@ export class TDictResponse extends TBaseResponse<IDictResponse> implements IDict
       return defaultDictPara;
     }
     try {
-      const obj = JSON.parse(dictPara) as TDictResponseDictPara;
+      const obj = JSONUtils.parseJSON(dictPara) as TDictResponseDictPara;
       return _.merge(defaultDictPara, obj);
     } catch (e) {}
     return defaultDictPara;

package/src/core/IPartResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import { TCore } from "../index.ts";
 import _ from "lodash";
 import { TWithEXPDS, TWithMYOA, WithEXPDS, WithMYOA } from "./IUserResponse.ts";
@@ -105,7 +106,7 @@ export class TPartResponse implements IPartResponse {
       return defaultPathPara;
     }
     try {
-      const obj = JSON.parse(partPara) as TPathResponsePathPara;
+      const obj = JSONUtils.parseJSON(partPara) as TPathResponsePathPara;
       return _.merge(defaultPathPara, obj);
     } catch (e) {}
     return defaultPathPara;

package/src/core/ISysMenuWithCoreResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import _ from "lodash";
 import type { IWldyPageResponse } from "../wldy/IWldyPageResponse";
 import type { IDictResponse } from "./IDictResponse";
@@ -157,7 +158,7 @@ export class TSysMenuWithCoreResponse implements ISysMenuWithCoreResponse {
       return defaultMenuPara;
     }
     try {
-      const obj = JSON.parse(menuPara) as TSysMenuWithCoreResponseMenuPara;
+      const obj = JSONUtils.parseJSON(menuPara) as TSysMenuWithCoreResponseMenuPara;
       return _.merge(defaultMenuPara, obj);
     } catch (e) {}
     return defaultMenuPara;

package/src/core/ISysMenuWithExpdResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import _ from "lodash";
 import { IFlowMainResponse } from "../flow";
 import { IGamsCnfgResponse } from "../gams";
@@ -339,7 +340,7 @@ export class TSysMenuWithExpdResponse implements ISysMenuWithExpdResponse {
       return defaultMenuPara;
     }
     try {
-      const obj = JSON.parse(menuPara) as TSysMenuWithExpdResponseMenuPara;
+      const obj = JSONUtils.parseJSON(menuPara) as TSysMenuWithExpdResponseMenuPara;
       return _.merge(defaultMenuPara, obj);
     } catch (e) { }
     return defaultMenuPara;

package/src/core/ISysTravelResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import _ from "lodash";
 
 export interface ISysTravelWithParaResponse {
@@ -130,7 +131,7 @@ export class TSysTravelResponse implements ISysTravelResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(withPara) as TSysTravelWithParaResponse;
+      const temp = JSONUtils.parseJSON(withPara) as TSysTravelWithParaResponse;
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;

package/src/core/IUnitResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import { construct, destruct } from "@aximario/json-tree";
 import _ from "lodash";
 import { type IBaseResponse, TBaseResponse } from "../base/IBaseResponse";
@@ -251,7 +252,7 @@ export class TUnitResponse extends TBaseResponse<IUnitResponse> implements IUnit
       return defaultUnitPara;
     }
     try {
-      const obj = JSON.parse(unitPara) as TUnitResponseElemPara;
+      const obj = JSONUtils.parseJSON(unitPara) as TUnitResponseElemPara;
       return _.merge(defaultUnitPara, obj);
     } catch (e) {}
     return defaultUnitPara;

package/src/core/IWebSocketResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "./jsonUtils";
 import _ from "lodash";
 
 export interface IWebSocketResponse {
@@ -31,7 +32,7 @@ export class TWebSocketResponse implements IWebSocketResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(data) as TWebSocketResponse;
+      const temp = JSONUtils.parseJSON(data) as TWebSocketResponse;
       return _.merge(result, temp);
     } catch (e: any) {
       console.error(e.message);

package/src/core/jsonUtils.ts

@@ -0,0 +1,24 @@
+import _ from "lodash";
+
+class JSONUtils {
+  /** 空输入、非法 JSON 或解析结果为 null 时抛出统一错误，返回类型兼容原生解析。 */
+  public static parseJSON(jsonStr: string | undefined | null): ReturnType<typeof JSON.parse> {
+    try {
+      if (typeof jsonStr !== "string") {
+        throw new TypeError("参数约定内控不正确，请检查!");
+      }
+      if (_.isEmpty(jsonStr.trim())) {
+        return {};
+      }
+      const result: unknown = JSON.parse(jsonStr);
+      if (result === null) {
+        throw new TypeError("JSON 解析失败,请");
+      }
+      return result;
+    } catch {
+      throw new Error("json转换失败，请检查参数约定");
+    }
+  }
+}
+
+export default JSONUtils;

package/src/enums/btnMode.ts

@@ -211,5 +211,7 @@ export enum TButtonType {
   /** 导出车单 */
   exportCar = "exportCar",
   /** 复制至一般公共预算 */
-  copyYbMoney = "copyYbMoney"
+  copyYbMoney = "copyYbMoney",
+  /**清理报告 */
+  dataCleaning = "dataCleaning",
 }

package/src/flow/IFlowDutyResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import type { IFlowNodeResponse } from "./IFlowNodeResponse";
 import type { IFlowDutyNodeParaConv } from "./IFlowDutyNodeParaConv";
@@ -77,7 +78,7 @@ export class TFlowDutyResponse implements IFlowDutyResponse {
       return defaultNodePara;
     }
     try {
-      const obj = JSON.parse(nodePara) as IFlowDutyNodeParaConv;
+      const obj = JSONUtils.parseJSON(nodePara) as IFlowDutyNodeParaConv;
       return _.merge(defaultNodePara, obj);
     } catch (e) {}
     return defaultNodePara;

package/src/flow/IFlowNodeResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import type { IDictResponse } from "../core/IDictResponse";
 import type { IPartResponse } from "../core/IPartResponse";
@@ -513,7 +514,7 @@ export class TFlowNodeResponse implements IFlowNodeResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(nodePara) as TFlowNodeResponseNodePara;
+      const temp = JSONUtils.parseJSON(nodePara) as TFlowNodeResponseNodePara;
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;

package/src/gzjg/IGzjgGzlmResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import { construct, destruct } from "@aximario/json-tree";
 import _ from "lodash";
 import { IElemElemResponse } from "../elem/IElemElemResponse";
@@ -186,7 +187,7 @@ export class TGzjgGzlmResponse implements IGzjgGzlmResponse {
       return defaultGzlmPara;
     }
     try {
-      const obj = JSON.parse(gzlmPara) as TGzjgGzlmResponseGzlmPara;
+      const obj = JSONUtils.parseJSON(gzlmPara) as TGzjgGzlmResponseGzlmPara;
       return _.merge(defaultGzlmPara, obj);
     } catch (_e) { }
     return defaultGzlmPara;

package/src/gzjg/IGzjgGzlmResponseGzlmPara.ts

@@ -21,6 +21,8 @@ export interface IGzjgGzlmResponseGzlmPara {
   titleYearNum: number;
   /** 标题中启用的当前年度的年份差值并且加上月份的截止 (默认为999表示不启用，0的话标题显示为当前年度，其余值为与当前年度的差值)*/
   titleYearNumMonth: number;
+  /** 是否启用仅管理员可以修改 */
+  onlyAdminUse: boolean;
 }
 
 export class TGzjgGzlmResponseGzlmPara implements IGzjgGzlmResponseGzlmPara {
@@ -45,4 +47,6 @@ export class TGzjgGzlmResponseGzlmPara implements IGzjgGzlmResponseGzlmPara {
   titleYearNum: number = 999;
   /** 标题中启用的当前年度的年份差值并且加上月份的截止 (默认为999表示不启用，0的话标题显示为当前年度，其余值为与当前年度的差值)*/
   titleYearNumMonth: number = 999;
+  /** 是否启用仅管理员可以修改 */
+  onlyAdminUse: boolean = false;
 }

package/src/gzjg/IGzjgMainResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import type { IDictResponse } from "../core/IDictResponse";
 import type { IGzjgBodyLockResponse, TGzjgBodyLockResponse } from "./IGzjgBodyLockResponse";
@@ -252,7 +253,7 @@ export class TGzjgMainResponse implements IGzjgMainResponse {
       return defaultGzjgPara;
     }
     try {
-      const obj = JSON.parse(gzjgPara) as IGzjgMainResponseGzjgPara;
+      const obj = JSONUtils.parseJSON(gzjgPara) as IGzjgMainResponseGzjgPara;
       return _.merge(defaultGzjgPara, obj);
     } catch (e) {}
     return defaultGzjgPara;

package/src/index.ts

@@ -123,3 +123,4 @@ export {
   type IToolDownLoadData,
   type IWtuiConfig
 };
+export { default as JSONUtils } from "./core/jsonUtils";

package/src/tabl/ITablMainResponse.ts

@@ -72,6 +72,7 @@ export interface ITablMainResponse {
   unitLike: string;
   unitType: number;
   taskMain: number;
+  taskName: string;
   unitTypeText: string;
   ERORMEMO: string;
   userMain: number;
@@ -85,6 +86,7 @@ export interface ITablMainResponse {
   // 用户名称
   commitBy: string;
   asNormal: number;
+  endedDay: number;
   listData: Array<ITablDataResponse>;
   listPath: TCore.IPathResponse[];
   listWZK8: ITablWzk8Response[];
@@ -161,12 +163,16 @@ export class TTablMainResponse implements ITablMainResponse {
   unitType: number = 0;
   unitTypeText: string = "";
   taskMain: number = 0;
+  taskName: string = "";
+
   userMain: number = 0;
   tablMode: number = 0;
   tablName: string = "";
   commitID: number = 0;
   commitBy: string = "";
   asNormal: number = 0;
+  endedDay: number = 0;
+
   listData: Array<ITablDataResponse> = [];
   listPath: TCore.IPathResponse[] = [];
   listWZK8: ITablWzk8Response[] = [];

package/src/wldy/IWldyPageResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import { IWldyDataResponse } from "./IWldyDataResponse";
 import { TWldyPageParaResponse } from "./IWldyPageParaResponse";
@@ -106,7 +107,7 @@ export class TWldyPageResponse implements IWldyPageResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(pagePara) as TWldyPageParaResponse;
+      const temp = JSONUtils.parseJSON(pagePara) as TWldyPageParaResponse;
       return _.merge(result, temp);
     } catch (e) {}
     return result;

package/src/wtui/IViewCtrlResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import { construct } from "@aximario/json-tree";
 import { IBaseResponse, TBaseResponse } from "../base/IBaseResponse";
 import _ from "lodash";
@@ -90,7 +91,7 @@ export class TViewCtrlResponse extends TBaseResponse<IViewCtrlResponse> implemen
       return result;
     }
     try {
-      const temp = JSON.parse(withPara) as TViewCtrlResponseWithParaConv;
+      const temp = JSONUtils.parseJSON(withPara) as TViewCtrlResponseWithParaConv;
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;

package/src/wtui/IWtuiFormResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import { IWtuiFormParaResponse, TWtuiFormParaResponse } from "./IWtuiFormParaResponse";
 import { IWtuiItemResponse } from "./IWtuiItemResponse";
@@ -83,7 +84,7 @@ export class TWtuiFormResponse implements IWtuiFormResponse {
       return formParaObj;
     }
     try {
-      const obj = JSON.parse(formPara) as TWtuiFormParaResponse;
+      const obj = JSONUtils.parseJSON(formPara) as TWtuiFormParaResponse;
       const result = _.merge(formParaObj, obj);
       return result;
     } catch (e) {}

package/src/wtui/IWtuiItemResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import { IWtuiItemParaResponse, TWtuiItemParaResponse } from "./IWtuiItemParaResponse";
 import { IDictResponse } from "../core";
@@ -107,7 +108,7 @@ export class TWtuiItemResponse implements IWtuiItemResponse {
       return itemParaObj;
     }
     try {
-      const obj = JSON.parse(itemPara) as TWtuiItemParaResponse;
+      const obj = JSONUtils.parseJSON(itemPara) as TWtuiItemParaResponse;
       const result = _.merge(itemParaObj, obj);
       return result;
     } catch (e) {}

package/src/wtui/IWtuiTodoResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import { IWtuiTodoResponseTodoPara, TWtuiTodoResponseTodoPara } from "./IWtuiTodoResponseTodoPara";
 import { IWtuiTodoResponseWithPara, TWtuiTodoResponseWithPara } from "./IWtuiTodoResponseWithPara";
@@ -83,7 +84,7 @@ export class TWtuiTodoResponse implements IWtuiTodoResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(withPara) as TWtuiTodoResponseWithPara[];
+      const temp = JSONUtils.parseJSON(withPara) as TWtuiTodoResponseWithPara[];
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;
@@ -95,7 +96,7 @@ export class TWtuiTodoResponse implements IWtuiTodoResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(todoPara) as TWtuiTodoResponseTodoPara;
+      const temp = JSONUtils.parseJSON(todoPara) as TWtuiTodoResponseTodoPara;
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;

package/src/wtui/IWtuiUserCnfgResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 import { IUnitResponse } from "../core";
 import { IWtuiColWidthResponse, TWtuiColWidthResponse } from "./IWtuiColWidthResponse";
@@ -135,7 +136,7 @@ export class TWtuiUserCnfgResponse implements IWtuiUserCnfgResponse {
       return defaultDictPara;
     }
     try {
-      const obj = JSON.parse(dictPara) as TCnfgPara;
+      const obj = JSONUtils.parseJSON(dictPara) as TCnfgPara;
       return _.merge(defaultDictPara, obj);
     } catch (e) { }
     return defaultDictPara;

package/src/wzpz/IWzWithParaResponse.ts

@@ -1,3 +1,4 @@
+import JSONUtils from "../core/jsonUtils";
 import _ from "lodash";
 /* 物资参数约定 */
 export interface IWzWithParaResponse {
@@ -139,7 +140,7 @@ export class TWzWithParaResponse implements IWzWithParaResponse {
       return result;
     }
     try {
-      const temp = JSON.parse(withPara) as TWzWithParaResponse;
+      const temp = JSONUtils.parseJSON(withPara) as TWzWithParaResponse;
       return _.merge(result, temp);
     } catch (e: any) {}
     return result;

package/src/card/ISyszclbgblbResponse.ts~

@@ -1,67 +0,0 @@
-import _ from "lodash";
-
-export interface ISyszclbgblbResponse {
-    whoBuild: number
-    userIndx: number
-    zclbIndx: number
-    dataStat: number
-    dataHide: number
-    dataOrdr: number
-    dataFrom: number
-    dataDate: number
-    dataTime: number
-    createBy: string
-    createAt: number
-    updateBy: string
-    updateAt: number
-    deleteBy: string
-    deleteAt: number
-    queuesBy: number
-    fromWhoBuild: number
-    fromUserIndx: number
-    fromGblbIndx: number
-    sourceND: number
-    fromSourceND: number
-
-    zclbTypeText: string
-    zclbCode: string
-    zclbName: string
-    gblbCode: string
-    gblbName: string
-}
-
-export class TSyszclbgblbResponse implements ISyszclbgblbResponse {
-    whoBuild: number = 0
-    userIndx: number = 0
-    zclbIndx: number = 0
-    dataStat: number = 0
-    dataHide: number = 0
-    dataOrdr: number = 0
-    dataFrom: number = 0
-    dataDate: number = 0
-    dataTime: number = 0
-    createBy: string = ""
-    createAt: number = 0
-    updateBy: string = ""
-    updateAt: number = 0
-    deleteBy: string = ""
-    deleteAt: number = 0
-    queuesBy: number = 0
-    fromWhoBuild: number = 0
-    fromUserIndx: number = 0
-    fromGblbIndx: number = 0
-    sourceND: number = 0
-    fromSourceND: number = 0
-
-    zclbTypeText: string = ""
-    zclbCode: string = ""
-    zclbName: string = ""
-    gblbCode: string = ""
-    gblbName: string = ""
-
-    constructor(data: any = {}) {
-        if (data) {
-            _.merge(this, _.pick(data, Object.keys(this)));
-        }
-    }
-}

package/src/card/IZclbgblbResponse.ts~

@@ -1,68 +0,0 @@
-import _ from "lodash";
-
-export interface ISyszclbgblb{
-    whoBuild : number
-    userIndx : number
-    zclbIndx : number
-    dataStat : number
-    dataHide : number
-    dataOrdr : number
-    dataFrom : number
-    dataDate : number
-    dataTime : number
-    createBy : string
-    createAt : number
-    updateBy : string
-    updateAt : number
-    deleteBy : string
-    deleteAt : number
-    queuesBy : number
-    fromWhoBuild: number
-    fromUserIndx: number
-    fromGblbIndx: number
-    sourceND : number
-    fromSourceND: number
-
-    zclbTypeText : string
-    zclbCode: string
-    zclbName: string
-    gblbCode: string
-    gblbName: string
-
-}
-
-export class TSyszclbgblb implements ISyszclbgblb{
-    whoBuild : number  = 0
-    userIndx : number  = 0
-    zclbIndx : number  = 0
-    dataStat : number  = 0
-    dataHide : number  = 0
-    dataOrdr : number  = 0
-    dataFrom : number  = 0
-    dataDate : number  = 0
-    dataTime : number  = 0
-    createBy : string  =''
-    createAt : number  = 0
-    updateBy : string  =''
-    updateAt : number  = 0
-    deleteBy : string  =''
-    deleteAt : number  = 0
-    queuesBy : number  = 0
-    fromWhoBuild: number  = 0
-    fromUserIndx: number  = 0
-    fromGblbIndx: number  = 0
-    sourceND : number  = 0
-    fromSourceND: number  = 0
-
-    zclbTypeText : string  =""
-    zclbCode: string    =""
-    zclbName: string  =""
-    gblbCode: string  =""
-    gblbName: string  =""
-
-    constructor(data: Partial<ISYSZCLBGBLB> = {}) {
-        if (data) {
-            _.merge(this, _.pick(data, Object.keys(this)));
-        }
-    }
-}

package/src/const/const_wtui_item_type.ts~

@@ -1,20 +0,0 @@
-export const CONST_ITEM_TYPE_TO_数值 = 0; // #数值
-export const CONST_ITEM_TYPE_TO_文本 = 1; // #文本
-export const CONST_ITEM_TYPE_TO_文本域 = 2; // #备注
-export const CONST_ITEM_TYPE_TO_日期 = 3; // #日期
-export const CONST_ITEM_TYPE_TO_字典 = 4; // #字典
-
-export const CONST_VALIDATE_TO_手机号码 = 0; // #整数
-export const CONST_VALIDATE_TO_邮箱 = 1; // #文本
-export const CONST_VALIDATE_TO_身份证 = 2; // #备注
-export const CONST_VALIDATE_TO_自定义 = 3;
-
-export const CONST_CLEARABLE_TO_不清空 = 0; //不清空
-export const CONST_CLEARABLE_TO_清空 = 1; //清空
-export const CONST_CLEARABLE_TO_询问 = 2; //询问
-
-export const CONST_OPERATOR_TO_大于 = 0; //大于
-export const CONST_OPERATOR_TO_等于 = 1; //等于
-export const CONST_OPERATOR_TO_小于 = 2; //小于
-export const CONST_OPERATOR_TO_大于等于 = 3; //大于等于
-export const CONST_OPERATOR_TO_小于等于 = 4; //小于等于