@ningboyz/types 1.0.29 → 1.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/types",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "private": false,
   "description": "宁波甬政类型库",
   "author": "nbyt-syq",
@@ -16,8 +16,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@aximario/json-tree": "2.2.4"
+    "@aximario/json-tree": "2.2.4",
+    "lodash": "4.17.21"
   },
   "devDependencies": {
+    "@types/lodash": "4.17.16"
   }
 }

package/src/const/const_type_name.ts

@@ -160,3 +160,5 @@ export const CONST_SYS_TYPEU_使用部门_部门类型 = "使用部门-部门类
 
 export const CONST_SYS_TYPEU_变动方式_固定资产 = "变动方式-固定资产";
 export const CONST_SYS_TYPEU_打印设置_纸张尺寸 = "打印设置-纸张尺寸";
+
+export const CONST_SYS_TYPEU_固定资产_卡片打印 = "固定资产-卡片打印";

package/src/core/IUserResponse.ts

@@ -266,6 +266,13 @@ export class TUserResponse extends TBaseResponse<IUserResponse[]> implements IUs
   listWlzfEnvr: any[] = [];
   listUserAcno: IUserAcnoResponse[] = [];
 
+  constructor(response?: any) {
+    super();
+    if (response) {
+      _.merge(this, _.pick(response, Object.keys(this)));
+    }
+  }
+
   public static toTree(listUser: IUserResponse[]) {
     return construct(listUser, { id: "userIndx", pid: "parentID", children: "children" }) as IUserResponse[];
   }

package/src/gzjg/IGzjgGzlmResponse.ts

@@ -8,6 +8,7 @@ export interface IGzjgGzlmResponse {
   userIndx: number;
   gzjgIndx: number;
   gzlmFlid: number;
+
   parentID: number;
   parentCD: string | undefined;
   dataLevl: number;
@@ -74,12 +75,11 @@ export interface IGzjgGzlmResponse {
 }
 
 export class TGzjgGzlmResponse implements IGzjgGzlmResponse {
-  jsScript: string = "";
-  sql4Load: string = "";
   whoBuild: number = 0;
   userIndx: number = 0;
   gzjgIndx: number = 0;
   gzlmFlid: number = 0; // 主键序号
+
   parentID: number = 0;
   parentCD: string | undefined = undefined;
   dataLevl: number = 0;
@@ -124,6 +124,8 @@ export class TGzjgGzlmResponse implements IGzjgGzlmResponse {
   dataGUID: string = "";
 
   isLasted: number = 0;
+  jsScript: string = "";
+  sql4Load: string = "";
 
   expdType: number = 0;
   expdTypc: string = "";

package/src/gzjg/IGzjgMainResponse.ts

@@ -75,16 +75,38 @@ export interface IGzjgMainResponse {
   thHeight: number;
   gzjgPara: string;
   gzjgParaConv: IGzjgMainResponseGzjgPara;
-  sql4load: string;
+
   gzjgIcon: string;
   gzlmSize: number;
-  jsScript: string;
-
-  bodyText: string;
+  jsScript: string; //#js运行脚本
+  sql4load: string; //#sql运行脚本
+
+  usesGsqj: number;
+  unionCnt: number;
+  unionTyp: number; //#人员集合类型
+  menuMain: number;
+  menuUUID: string;
+  usesHold: number;
+  holdRate: number;
+
+  antvView: number;
+  asHolder: number;
+  qzgsSize: number;
+  fixedCol: number;
+  fixedRow: number;
+  gzjgFrom: number;
+  gzjgMode: number;
+  directAt: number;
 
   usesPrevious: number;
   colsCopyText: string;
   rowsCopyText: string;
+  userTypeText: string; //#用户类型.文本
+  unitTypeText: string; //#单位类型.文件
+  pathTypeText: string; //#附件类型.文本
+
+  usesItemWhenPzpt: number;
+  useEqualWhenPzpt: number;
 
   listCols: IGzjgGzlmResponse[];
   listRows: IGzjgGzlmResponse[];
@@ -97,6 +119,7 @@ export interface IGzjgMainResponse {
   gzlmLock: IGzjgGzlmResponse[];
 
   // 虚拟字段
+  bodyText: string;
   colIndex: number; // 报表工资栏目显示起始位置
   antvData: number;
 }
@@ -162,11 +185,34 @@ export class TGzjgMainResponse implements IGzjgMainResponse {
   gzjgIcon: string = "";
   gzlmSize: number = 0;
 
+  usesGsqj: number = 0; //#
+  unionCnt: number = 0;
+  unionTyp: number = 0;
+  menuMain: number = 0;
+  menuUUID: string = "";
+  usesHold: number = 0;
+  holdRate: number = 0;
+
+  antvView: number = 0;
+  asHolder: number = 0;
+  qzgsSize: number = 0;
+  fixedCol: number = 0;
+  fixedRow: number = 0;
+  gzjgFrom: number = 0;
+  gzjgMode: number = 0;
+  directAt: number = 0;
+
   bodyText: string = "";
 
   usesPrevious: number = 0;
   colsCopyText: string = "";
   rowsCopyText: string = "";
+  userTypeText: string = ""; //#用户类型.文本
+  unitTypeText: string = ""; //#单位类型.文件
+  pathTypeText: string = ""; //#附件类型.文本
+
+  usesItemWhenPzpt: number = 0;
+  useEqualWhenPzpt: number = 0;
 
   listCols: IGzjgGzlmResponse[] = [];
   listGZLM: IGzjgGzlmResponse[] = [];
@@ -189,10 +235,7 @@ export class TGzjgMainResponse implements IGzjgMainResponse {
     try {
       const obj = JSON.parse(gzjgPara) as IGzjgMainResponseGzjgPara;
       return _.merge(defaultGzjgPara, obj);
-    } catch (e) {
-      const error = e as Error;
-      console.error(error.message);
-    }
+    } catch (e) {}
     return defaultGzjgPara;
   }
-}
+}

package/src/gzjg/IGzjgMainResponseWithYZPZ.ts

@@ -0,0 +1,41 @@
+export interface IGzjgMainResponseWithYZPZ {
+  createAt: number;
+  createBy: string;
+  dataDate: number;
+  dataFrom: number;
+  dataHide: number;
+  dataOrdr: number;
+  dataStat: number;
+  dataTime: number;
+  deleteAt: number;
+  deleteBy: string;
+  gzjgIndx: number;
+  k0kmKmid: number;
+  sourceID: number;
+  sourceND: number;
+  updateAt: number;
+  updateBy: string;
+  userIndx: number;
+  whoBuild: number;
+}
+
+export class TGzjgMainResponseWithYZPZ implements IGzjgMainResponseWithYZPZ {
+  createAt: number = 0;
+  createBy: string = "";
+  dataDate: number = 0;
+  dataFrom: number = 0;
+  dataHide: number = 0;
+  dataOrdr: number = 0;
+  dataStat: number = 0;
+  dataTime: number = 0;
+  deleteAt: number = 0;
+  deleteBy: string = "";
+  gzjgIndx: number = 0;
+  k0kmKmid: number = 0;
+  sourceID: number = 0;
+  sourceND: number = 0;
+  updateAt: number = 0;
+  updateBy: string = "";
+  userIndx: number = 0;
+  whoBuild: number = 0;
+}

package/src/gzjg/index.ts

@@ -3,6 +3,7 @@ import { IGzjgGzlmLandResponse, TGzjgGzlmLandResponse } from "./IGzjgGzlmLandRes
 import { IGzjgGzlmResponse, TGzjgGzlmResponse } from "./IGzjgGzlmResponse";
 import { IGzjgMainResponse, TGzjgMainResponse } from "./IGzjgMainResponse";
 import { IGzjgQzgsResponse, TGzjgQzgsResponse } from "./IGzjgQzgsResponse";
+import { IGzjgMainResponseWithYZPZ, TGzjgMainResponseWithYZPZ } from "./IGzjgMainResponseWithYZPZ";
 
 export {
   type IGzjgBodyLockResponse,
@@ -10,9 +11,11 @@ export {
   type IGzjgGzlmResponse,
   type IGzjgMainResponse,
   type IGzjgQzgsResponse,
+  type IGzjgMainResponseWithYZPZ,
   TGzjgBodyLockResponse,
   TGzjgGzlmLandResponse,
   TGzjgGzlmResponse,
   TGzjgMainResponse,
-  TGzjgQzgsResponse
+  TGzjgQzgsResponse,
+  TGzjgMainResponseWithYZPZ
 };

package/src/load/IYqkmResponse.ts

@@ -21,6 +21,7 @@ export interface IYqkmResponse {
   yqkmIndx: number;
   yqkmName: string;
   yqkmType: number;
+  yqkmYefx: string;
 }
 
 export class TYqkmResponse implements IYqkmResponse {
@@ -46,4 +47,5 @@ export class TYqkmResponse implements IYqkmResponse {
   yqkmIndx: number = 0;
   yqkmName: string = "";
   yqkmType: number = 0;
+  yqkmYefx: string = "";
 }

package/src/store/dateState.ts

@@ -23,6 +23,7 @@ export interface IDateState {
 
   /** 启用年度 */
   usesKJND: string;
+
   /** 启用期间 */
   usesKJQJ: string;
 

package/src/wtui/IViewCtrlResponse.ts

@@ -28,10 +28,6 @@ export interface IViewCtrlResponse extends IBaseResponse<IViewCtrlResponse> {
   wtuiMain: number;
   labelVal: string;
   viewIndx: number;
-  //虚拟字段
-  title: string;
-  name: string;
-  icon: string;
 }
 
 export class TViewCtrlResponse extends TBaseResponse<IViewCtrlResponse> implements IViewCtrlResponse {
@@ -61,17 +57,7 @@ export class TViewCtrlResponse extends TBaseResponse<IViewCtrlResponse> implemen
   wtuiMain: number = 0;
   labelVal: string = "";
   viewIndx: number = 0;
-  title: string = "";
-  name: string = "";
-  icon: string = "";
-
   static toTree(listView: IViewCtrlResponse[]) {
-    listView.forEach((element) => {
-      element.title = element.viewName;
-      element.name = element.view4url;
-      element.icon = `iconfont ${element.viewIcon}`;
-      element.children = [];
-    });
     return construct(listView, { id: "uniqueID", pid: "parentID", children: "children" }) as IViewCtrlResponse[];
   }
 }

package/src/wtui/IWtuiMainResponse.ts

@@ -8,7 +8,7 @@ export interface IWtuiMainResponse {
   userIndx: number;
   wtuiIndx: number; // #唯一标识
   wtuiMain: number;
-
+  asFormer: number;
   createAt: number;
   createBy: string;
   dataDate: number;
@@ -48,7 +48,7 @@ export interface IWtuiMainResponse {
   updateBy: string;
   wtuiMemo: string; // #界面备注
   wtuiName: string; // #界面名称
-
+  microTab: string;
   unitTypeSize: number;
   unitTypeText: string; // #单位类型
 
@@ -63,7 +63,7 @@ export class TWtuiMainResponse implements IWtuiMainResponse {
   userIndx: number = 0;
   wtuiIndx: number = 0;
   wtuiMain: number = 0;
-
+  asFormer: number = 0;
   entityID: string = "";
   parentID: number = 0;
   queuesBy: number = 0;
@@ -90,6 +90,7 @@ export class TWtuiMainResponse implements IWtuiMainResponse {
   mastName: string = "";
   microApp: string = "";
   microURL: string = "";
+  microTab: string = "";
   name4Map: string = "";
   outLogo1: string = "";
   outLogo2: string = "";

package/src/wtui/IWtuiOperateResponse.ts

@@ -0,0 +1,80 @@
+import { construct } from "@aximario/json-tree";
+
+export interface IWtuiOperateResponse {
+  createAt: number; // 创建时间戳
+  createBy: string; // 创建者
+  ctrlCode: string; // 控件代码
+  ctrlIndx: number; // 控件索引
+  ctrlMemo: string; // 控件备注
+  ctrlName: string; // 控件名称
+  ctrlPara: string; // 控件参数
+  dataDate: number; // 数据日期
+  dataFrom: number; // 数据来源
+  dataHide: number; // 是否隐藏（0 表示显示，1 表示隐藏）
+  dataOrdr: number; // 数据排序
+  dataStat: number; // 数据状态
+  dataTime: number; // 数据时间戳
+  deleteAt: number; // 删除时间戳
+  deleteBy: string; // 删除者
+  dictMain: number; // 字典主表标识
+  entityID: string; // 实体 ID
+  jsMethod: string; // JS 方法
+  mastGUID: string; // 主表 GUID
+  mastName: string; // 主表名称
+  metaData: string; // 元数据信息
+  parentID: number; // 父级 ID
+  queuesBy: number; // 队列标识
+  updateAt: number; // 更新时间戳
+  updateBy: string; // 更新者
+  userIndx: number; // 用户索引
+  whoBuild: number; // 构建者
+  withPara: string; // 是否带参数
+  wtuiMain: number; // WTUI 主表标识
+  wtuiView: number; // WTUI 视图标识
+}
+
+export class TWtuiOperateResponse implements IWtuiOperateResponse {
+  createAt: number = 0;
+  createBy: string = "";
+  ctrlCode: string = "";
+  ctrlIndx: number = 0; // 控件索引
+  ctrlMemo: string = ""; // 控件备注
+  ctrlName: string = ""; // 控件名称
+  ctrlPara: string = ""; // 控件参数
+  dataDate: number = 0;
+  dataFrom: number = 0;
+  dataHide: number = 0;
+  dataOrdr: number = 0;
+  dataStat: number = 0;
+  dataTime: number = 0;
+  deleteAt: number = 0;
+  deleteBy: string = "";
+  dictMain: number = 0;
+  entityID: string = "";
+  jsMethod: string = "";
+  mastGUID: string = "";
+  mastName: string = "";
+  metaData: string = "";
+  parentID: number = 0;
+  queuesBy: number = 0;
+  updateAt: number = 0;
+  updateBy: string = "";
+  userIndx: number = 0;
+  whoBuild: number = 0;
+  withPara: string = "";
+  wtuiMain: number = 0;
+  wtuiView: number = 0;
+
+  static toTree(listView: IWtuiOperateResponse[]): IWtuiOperateResponse[] {
+    // 遍历列表，为每个元素添加树形结构所需的字段
+    // listView.forEach((element) => {
+    //   element.title = element.ctrlName || ""; // 使用控件名称作为标题
+    //   element.name = element.mastGUID || ""; // 使用主表 GUID 作为唯一标识
+    //   element.icon = element.ctrlIcon || ""; // 如果有控件图标，则使用控件图标
+    //   element.children = []; // 初始化子节点数组
+    // });
+
+    // 使用 construct 方法构建树形结构
+    return construct(listView, { id: "entityID", pid: "parentID", children: "children" }) as IWtuiOperateResponse[];
+  }
+}

package/src/wtui/IWtuiViewResponse.ts

@@ -2,8 +2,9 @@ export interface IWtuiViewResponse {
   whoBuild: number;
   userIndx: number;
   viewIndx: number;
-
+  sysClasc: number;
   wtuiMain: number;
+  wtuiView: number;
   parentID: number;
   dataStat: number;
   dataHide: number;
@@ -21,7 +22,7 @@ export interface IWtuiViewResponse {
   deleteAt: number;
   queuesBy: number;
   entityID: string;
-
+  parentMC: string;
   listDict: IWtuiViewResponse[];
 
   view4url: string; // #页面链接
@@ -35,15 +36,19 @@ export interface IWtuiViewResponse {
   formType: string; // #表单形式
   microApp: string; // #microApp
   microURL: string; // #microURL
+  microTab: string;
   expandOn: number; // #默认展开
 
   labelVal: string;
 }
 
 export class TWtuiViewResponse implements IWtuiViewResponse {
+  parentMC: string = "";
+  wtuiView: number = 0;
   whoBuild: number = 0;
   userIndx: number = 0;
   viewIndx: number = 0;
+  sysClasc: number = 0;
   wtuiMain: number = 0;
   parentID: number = 0;
   dataStat: number = 0;
@@ -73,6 +78,7 @@ export class TWtuiViewResponse implements IWtuiViewResponse {
   formType: string = "";
   microApp: string = "";
   microURL: string = "";
+  microTab: string = "";
   expandOn: number = 0;
   listDict: IWtuiViewResponse[] = [];
   labelVal: string = "";

package/src/wtui/index.ts

@@ -13,6 +13,7 @@ import { IWtuiTodoResponseWithPara, TWtuiTodoResponseWithPara } from "./IWtuiTod
 import { IWtuiNodeResponse, TWtuiNodeResponse } from "./IWtuiNodeResponse";
 import { IWtuiUserCnfgResponse, TWtuiUserCnfgResponse } from "./IWtuiUserCnfgResponse";
 import { IWtuiColWidthResponse, TWtuiColWidthResponse } from "./IWtuiColWidthResponse";
+import { IWtuiOperateResponse, TWtuiOperateResponse } from "./IWtuiOperateResponse";
 import { IWtuiRootResponse, TWtuiRootResponse } from "./IWtuiRootResponse";
 
 export {
@@ -27,13 +28,14 @@ export {
   type IWtuiItemResponse,
   type IWtuiMainResponse,
   type IWtuiNodeResponse,
-  type IWtuiRootResponse,
   type IWtuiTodoResponse,
   type IWtuiTodoResponseTodoPara,
-  type IWtuiTodoResponseWithPara, 
-  type IWtuiUserCnfgResponse,
-  type IWtuiViewResponse, 
-  type IWtuiZoneResponse,
+  type IWtuiTodoResponseWithPara,
+  type IWtuiUserCnfgResponse, // 位置调整 ‌:ml-citation{ref="1,2" data="citationList"}
+  type IWtuiViewResponse,
+  type IWtuiZoneResponse, // 位置调整 ‌:ml-citation{ref="1,2" data="citationList"}
+  type IWtuiOperateResponse,
+  type IWtuiRootResponse,
   TDictEffect,
   TDictEffectData,
   TDictEffectField,
@@ -44,11 +46,12 @@ export {
   TWtuiItemResponse,
   TWtuiMainResponse,
   TWtuiNodeResponse,
-  TWtuiRootResponse,
   TWtuiTodoResponse,
   TWtuiTodoResponseTodoPara,
   TWtuiTodoResponseWithPara,
-  TWtuiUserCnfgResponse, 
+  TWtuiUserCnfgResponse, // 位置调整 ‌:ml-citation{ref="1,2" data="citationList"}
   TWtuiViewResponse,
-  TWtuiZoneResponse 
+  TWtuiZoneResponse, // 位置调整 ‌:ml-citation{ref="1,2" data="citationList"}
+  TWtuiOperateResponse,
+  TWtuiRootResponse
 };