调整修改报错

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/EntryBase.ts

@@ -3,13 +3,16 @@ import type { PageBase } from './PageBase'
 import type { ITradeHelper } from './ITradeHelper'
 import type { TradeBusHelper } from './TradeBusHelper'
 import type { TradeInfoHelper } from './TradeInfoHelper'
-import type { TradeAPIsHelper } from './TradeAPIsHelper'
+
 import type { TradeResourcesHelper } from './TradeResourcesHelper'
+import TradeAPIsHelper from "./TradeAPIsHelper";
+import { reactive } from "vue";
 
 /**
  * 入口基类，包括Message和PageBase
  */
 export class EntryBase implements ITradeHelper {
+    TradeResources: TradeAPIsHelper;
     //#region 数据属性
     private _messageData: Message | null = null
     private _pageData: PageBase | null = null
@@ -41,7 +44,7 @@ export class EntryBase implements ITradeHelper {
         // 检测参数变化
         if (page !== null && page === this.PageData) {
             if (message === this.MessageData ||
-                (message.FileData === this.MessageData?.FileData &&
+                (message.fileData === this.MessageData?.fileData &&
                     this.getDiffFields(message, this.MessageData).length === 0)) {
                 flag = false // 参数与历史登记一致，未作修改
             }
@@ -67,7 +70,6 @@ export class EntryBase implements ITradeHelper {
         return true
     }
 
-    #region ITradeHelper
     public get TradeBus(): TradeBusHelper {
         if (!this.PageData) throw new Error('PageData is null')
         return this.PageData.TradeBus
@@ -83,11 +85,11 @@ export class EntryBase implements ITradeHelper {
         return this.PageData.TradeAPIs
     }
 
-    public get TradeResources(): TradeResourcesHelper {
-        if (!this.PageData) throw new Error('PageData is null')
-        return this.PageData.TradeResources
-    }
-    #endregion
+    // public get TradeResources(): TradeResourcesHelper {
+    //     if (!this.PageData) throw new Error('PageData is null')
+    //     return this.PageData.TradeResources
+    // } hulei-/暂时注释
+
 }
 
 // Vue组件封装

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/HomePageBase.ts

@@ -1,29 +0,0 @@
-import { PageBase } from './PageBase'
-import { defineComponent } from 'vue'
-
-/**
- * 主界面框架基础
- */
-export abstract class HomePageBase extends PageBase {
-    constructor() {
-        super()
-    }
-
-    /**
-     * 加载交易宿主
-     * @param host 宿主元素
-     */
-    public LoadTradeHost(host: HTMLElement): void {
-        // 实现加载逻辑
-    }
-}
-
-// Vue组件封装
-export const HomePageComponent = defineComponent({
-    extends: HomePageBase,
-    methods: {
-        LoadTradeHost(host: HTMLElement) {
-            super.LoadTradeHost(host)
-        }
-    }
-})

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/PageBase.ts

@@ -11,6 +11,9 @@ import { ServiceSettings } from "@/views/front/develop/ServiceProxy.Ext/ServiceS
 import TradeHandle from '../../ServiceProxy.Ext/ServiceHelper/TradeHandle'
 import { PrintAttributes } from "../../PrintTemplate/Extension/PrintAttributes";
 import Message from '../../Communication/Message'
+import TradePage from '@/views/front/platfrom/presentation/PageFunctions/TradePage'
+import { PageContainer } from '@/views/front/platfrom/presentation/PageFunctions/PageContainer'
+import TradeModel from '@/views/front/platfrom/common/BasicFunctions/PageFunctions/TradeModel'
 //import TradeModel from "@/views/front/platfrom/common/BasicFunctions/";
 
 
@@ -18,7 +21,43 @@ import Message from '../../Communication/Message'
  * 页面基类，填充通用的业务接口API
  * 注意:该对象需要支持序列化/反序列化
  */
-export abstract class PageBase implements ITradeHelper {
+export abstract class PageBase implements TradePage, ITradeHelper {
+    get TradeModel(): TradeModel {
+        throw new Error('Method not implemented.')
+    }
+    set TradeModel(value: TradeModel) {
+        throw new Error('Method not implemented.')
+    }
+    get Ready(): { add: () => void; remove: () => void } {
+        throw new Error('Method not implemented.')
+    }
+    Dispose(): void {
+        throw new Error('Method not implemented.')
+    }
+    get OwnerContainer(): PageContainer {
+        throw new Error('Method not implemented.')
+    }
+    SetOwnerContainer(pageContainer: PageContainer): void {
+        throw new Error('Method not implemented.')
+    }
+    get InstanceId(): string {
+        throw new Error('Method not implemented.')
+    }
+    SetInstanceId(guid: string): void {
+        throw new Error('Method not implemented.')
+    }
+    get ViewStateData(): { [key: string]: any } {
+        throw new Error('Method not implemented.')
+    }
+    SetViewStateData(viewStateData: { [key: string]: any }): void {
+        throw new Error('Method not implemented.')
+    }
+    get PropertyChanged(): { add: () => void; remove: () => void } {
+        throw new Error('Method not implemented.')
+    }
+    protected raisePropertyChanged(propertyName: string): void {
+        throw new Error('Method not implemented.')
+    }
     // }
     // 冠字号对象
     // private cashCode: CashCodeEntry | null = null

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/TradeAPIsHelper.ts

@@ -1,6 +1,16 @@
 import SystemFunction from "@/views/front/develop/Library.Ext/Function/SystemFunction"
 import { PageBase } from "@/views/front/develop/Constract/ContractBase/PageBase";
 import Message from "../../Communication/Message";
+import { TradeManagerHandle } from "../../ServiceProxy.Ext/ServiceHelper/TradeManagerHandle";
+import LoginUserInfo from "@/views/front/platfrom/common/RunningParameters/LoginUserInfo";
+import { TradePowerManager } from "../../Library.Ext/TradeExtension/TradeMenu/TradePowerManager";
+import { LoginAuthentication } from "../../Library.Ext/TradeExtension/SSO/LoginAuthentication";
+import { CheckConditionElements } from "../Function/TradeCheck/CheckConditionElements";
+import { AuthConditionElement } from "../Function/TradeAuth/AuthConditionElement";
+import { CheckDataHelper } from "../Function/TradeCheck/CheckDataHelper";
+import { AuthDataHelper } from "../Function/TradeAuth/AuthDataHelper";
+import { WorkFlowHandle } from "@/views/front/platfrom/serviceproxy/ServiceHelper/WorkFlowHandle";
+import { AsksuperResultType, CheckManager } from "../Function/TradeCheck/CheckManager";
 
 class TradeAPIsHelper {
     // ctor & Property
@@ -13,7 +23,7 @@ class TradeAPIsHelper {
     // 封装交易API函数
     // Message操作
     public InitFd(message: Message): void {
-        SystemFunction.InitFd(this.Page, message);
+        SystemFunction.InitFd(message);
     }
 
     public CommSend(message: Message): void {
@@ -21,27 +31,27 @@ class TradeAPIsHelper {
     }
 
     public CommSend96(message: Message): void {
-        SystemFunction.CommSend96(this.Page, message);
+        SystemFunction.CommSend(this.Page, message);
     }
 
     public CallServer(message: Message): boolean {
-        return this.Page.CallServer(message);
+        return SystemFunction.CallServer(message);
     }
 
     public CallAgn(message: Message): boolean {
-        return this.Page.CallAgn(message);
+        return SystemFunction.CallAgn(message);
     }
 
     public CallAgnTips(message: Message): boolean {
-        return this.Page.CallAgnTips(message);
+        return SystemFunction.CallAgnTips(message);
     }
 
     public CallAgnRun(message: Message): boolean {
-        return this.Page.CallAgnRun(message);
+        return SystemFunction.CallAgnRun(message);
     }
 
     public CallMobileBanking(message: Message): boolean {
-        return this.Page.DoTransit(message, TransitType.CallMobileBanking);
+        return SystemFunction.DoTransit(message, TransitType.CallMobileBanking);
     }
 
     public CallAgnCIS(message: Message): boolean {
@@ -1037,7 +1047,7 @@ class TradeAPIsHelper {
     }
 
     public GetCheckElement(args: any): CheckConditionElements | null {
-        const SinAmt = args.SinAmt.toString();
+        let SinAmt = args.SinAmt.toString();
         let result: CheckConditionElements | null = null;
         const message: Message = {};
         this.InitFd(message);

ant-design-pro-vue3/src/views/front/develop/Library.Ext/Function/SystemFunction.ts

@@ -5,6 +5,7 @@ import { IPage } from "@/views/front/platfrom/presentation/Interfaces/Ipage";
 import { TransitType } from "@/views/front/develop/Communication/MessageHelper/TransitType";
 import { MainPageManager } from "@/views/front/develop/Library.Ext/TradeInterface/MainPage/MainPageManager";
 import TransitErrorCodeMap from "../../Communication/MessageHelper/TransitErrorCodeMap";
+import { PageBase } from "../../Constract/ContractBase/PageBase";
 // interface IPage {
 //     // 这里需要根据实际情况补充IPage接口的属性和方法
 //     OwnerContainer: any;
@@ -102,6 +103,9 @@ const LoginAuthentication = {
 };
 
 export default class SystemFunction {
+    static Len(Password: any) {
+        return 6;
+    }
     static GetError(errorCode: string): string {
         return TransitErrorCodeMap.GetInstance().GetErrorMessage(errorCode);
     }
@@ -110,7 +114,7 @@ export default class SystemFunction {
         return dataString;
     }
 
-    static InitFd(target: IPage, message: Message): void {
+    static InitFd(message: Message): void {//hulei-、去掉参数arget: IPage,没用
         message.Init(Message.BitMap);
     }
 
@@ -266,7 +270,7 @@ export default class SystemFunction {
         }
     }
 
-    static DoTransit(target: IPage, message: Message, transitName?: string): boolean {
+    static DoTransit(message: Message, transitName?: string): boolean { //去掉Ipage hulei target: IPage,
         //hulei 通讯逻辑需要改写不能按原有的处理
         if (message === null) return false;
         if (transitName !== undefined) message.TransitName = transitName;
@@ -275,28 +279,29 @@ export default class SystemFunction {
         const action = () => {
             returnValue = message.DoTransit();
         };
-        if (target.OwnerContainer !== null) {
-            // 假设这里有获取主页面的逻辑
-            const page = MainPageManager.GetMainPage() as IPage;//hulei创建页面
-            // if (page === null || !page.isAncestorOf(target)) {
-            //     page = target;
-            // }
-            // 假设这里有ModalInvoke的逻辑
-            // page.OwnerContainer.ModalInvoke(action, "网络通讯中，请稍后...");
-            //hulei
-        } else {
-            action();
-        }
+        // if (target.OwnerContainer !== null) {
+        // 假设这里有获取主页面的逻辑
+        // const page = MainPageManager.GetMainPage() as IPage;//hulei-s创建页面不知道在vue中是否存在
+
+        // if (page === null || !page.isAncestorOf(target)) {
+        //     page = target;
+        // }
+        // 假设这里有ModalInvoke的逻辑
+        // page.OwnerContainer.ModalInvoke(action, "网络通讯中，请稍后...");
+        //hulei
+        // } else {
+        action();
+        // }
         // target.GetTradeInfoData().LatestMessage = message;
         return returnValue;
     }
 
-    static CallServer(target: IPage, message: Message): boolean {
-        return this.DoTransit(target, message, "TransitType.CallServer");//hulei 改为字符
+    static CallServer(message: Message): boolean {
+        return this.DoTransit(message, "TransitType.CallServer");//hulei-s改为字符   Ipage 对象 不适用于vue
     }
 
-    static CallAgn(target: IPage, message: Message): boolean {
-        return this.DoTransit(target, message, "TransitType.CallAgn");
+    static CallAgn(message: Message): boolean {
+        return this.DoTransit(message, "TransitType.CallAgn");//target: IPage hulei-s改为字符   Ipage 对象 不适用于vue
     }
 
     // 其他方法...
@@ -308,7 +313,7 @@ export default class SystemFunction {
         return parseInt(number, 10);
     }
 
-    static Itoa(number: number, format: string): string {
+    static Itoa(Page: PageBase, number: number, format: string): string {
         const rgx = /^%{1}(-)?(([0-9]*)[dD]{1})|(([0-9]*)(.)?([0-9]*)[fF]{1})$/;
         if (!rgx.test(format)) {
             throw new Error("不支持该格式转换！");

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/Currency2DicManager.ts

@@ -1,19 +1,10 @@
-// 模拟依赖的类和方法
-class Message {
-    Fd16: string = '';
-    FileData: string = '';
-    TransitNode: any;
-    Fd12: string = '';
+import Message from "../../Communication/Message";
+import { TransitType } from "../../Communication/MessageHelper/TransitType";
 
-    DoTransit(): boolean {
-        // 模拟消息传输成功
-        return true;
-    }
-}
 
 namespace SystemFunction {
-    export function InitFd(_: any, message: Message) {}
-    export function CommSend(_: any, message: Message) {}
+    export function InitFd(_: any, message: Message) { }
+    export function CommSend(_: any, message: Message) { }
 }
 
 namespace UserFunction {
@@ -73,10 +64,10 @@ class Currency2DicManager {
             SystemFunction.CommSend(null, message);
             message.Fd16 = '2016';
             const dic: { [key: string]: string } = {};
-            message.FileData = UserFunction.ConvertDictionaryToXML(dic);
-            message.TransitNode = TellerSystem.Communication.MessageHelper.TransitType.CallNoFileSys;
+            message.fileData = UserFunction.ConvertDictionaryToXML(dic);
+            message.TransitNode = TransitType.CallNoFileSys;
             if (message.DoTransit() && message.Fd12 === '0000') {
-                const dt = UserFunction.ConvertXMLToDataTable(message.FileData);
+                const dt = UserFunction.ConvertXMLToDataTable(message.fileData);
                 dt.rows.forEach((row) => {
                     this._dicCurrency[row['CurrencyNo']] = row['CurrencyName'];
                 });
@@ -92,10 +83,10 @@ class Currency2DicManager {
             SystemFunction.CommSend(null, message);
             message.Fd16 = '2015';
             const dic: { [key: string]: string } = {};
-            message.FileData = UserFunction.ConvertDictionaryToXML(dic);
-            message.TransitNode = TellerSystem.Communication.MessageHelper.TransitType.CallNoFileSys;
+            message.fileData = UserFunction.ConvertDictionaryToXML(dic);
+            message.TransitNode = TransitType.CallNoFileSys;
             if (message.DoTransit() && message.Fd12 === '0000') {
-                const dt = UserFunction.ConvertXMLToDataTable(message.FileData);
+                const dt = UserFunction.ConvertXMLToDataTable(message.fileData);
                 dt.rows.forEach((row) => {
                     this._dicTicketDistinct[row['CouponsNo']] = row['CouponsName'];
                 });
@@ -115,4 +106,4 @@ class Currency2DicManager {
     }
 }
 
-export default Currency2DicManager;
+export default Currency2DicManager;

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/SystemBatch/BatchHelper.ts

@@ -1,6 +1,6 @@
 // 假设这些类型在其他文件中定义，这里先使用 any 占位
 
-import { BatSysInfo } from "@/views/front/develop/SServiceProxy.Ext/ServiceEntitys/BatSysInfo";
+import { BatSysInfo } from "@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/BatSysInfo";
 
 
 // 假设这些函数在其他文件中定义

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/TradeAttach/DeviceManager.ts

@@ -200,11 +200,11 @@ class DeviceManager {
         // 是否设计时
         // 这里简化处理，假设设计时判断逻辑
         if (false) {
-            if (d instanceof TextBox || d instanceof PasswordBox) {
-                // 这里简化处理，假设 FocusManager 相关方法
-                // FocusManager.RemoveGotFocusHandler(d, DeviceManager.tb_GotFocus);
-                // FocusManager.AddGotFocusHandler(d, DeviceManager.tb_GotFocus);
-            }
+            // if (d instanceof TextBox || d instanceof PasswordBox) {
+            //     // 这里简化处理，假设 FocusManager 相关方法
+            //     // FocusManager.RemoveGotFocusHandler(d, DeviceManager.tb_GotFocus);
+            //     // FocusManager.AddGotFocusHandler(d, DeviceManager.tb_GotFocus);
+            // }
         }
     }
 
@@ -212,19 +212,19 @@ class DeviceManager {
         let parentPage: IPage | null = null;
         let parent = sender as DependencyObject;
         while (parent) {
-            if (parent instanceof IPage) {
-                break;
-            }
+            // if (parent instanceof IPage) {hulei-/外设相关代码
+            //     break;
+            // }
             // 这里简化处理，假设 VisualTreeHelper 相关方法
             // parent = VisualTreeHelper.GetParent(parent);
         }
-        if (parent) {
-            parentPage = parent as IPage;
-        }
+        // if (parent) {
+        //     parentPage = parent as IPage;
+        // }
 
         let element = sender as FrameworkElement;
         if (element) {
-            element.ToolTip = "按F10可重新调用设备！";
+            // element.ToolTip = "按F10可重新调用设备！";
             // 这里简化处理，假设事件处理
             // element.PreviewKeyUp -= DeviceManager.ActiveDevice;
             // element.PreviewKeyUp += DeviceManager.ActiveDevice;
@@ -268,4 +268,4 @@ class DeviceManager {
     }
 }
 
-export default DeviceManager;
+export default DeviceManager;

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/TradeAttach/Encrypte.ts

@@ -1,7 +1,10 @@
 import { EncrypteHandle } from "../../../ServiceProxy.Ext/ServiceHelper/EncrypteHandle";
+import { TradeManagerHandle } from "../../../ServiceProxy.Ext/ServiceHelper/TradeManagerHandle";
 import SystemFunction from "../../Function/SystemFunction";
 import { LoginAuthentication } from "../SSO/LoginAuthentication";
-
+import UserFunction from "@/views/front/develop/Library.Ext/Function/UserFunction";
+// import TradeManagerHandle from "@/views/front/develop/ServiceProxy.Ext/ServiceHelper/";
+TellerSystem.ServiceProxy.Ext.ServiceHelper
 class Encrypte {
     private static readonly key = "33333333333333333333333333333333";
     public static AccountNo: string = "";
@@ -118,13 +121,13 @@ class Encrypte {
 
     private static GetAcctount(elementName: string, element: DependencyObject, acctount: { value: string }): void {
         if ('Text' in element && 'Name' in element && element.Name === elementName) {
-            acctount.value = (element as TextBox).Text;//hulei 
+            acctount.value = "";//(element as TextBox).Text;//hulei-r VUE中没有TextBox
         }
 
-        // 这里简化了 VisualTreeHelper 的逻辑，实际需要实现递归查找子元素
+        // hulei-r 这里简化了 VisualTreeHelper 的逻辑，实际需要实现递归查找子元素
     }
 
-    private static PreviewPasswordBox_LostFocus(sender: PasswordBox, e: any): void {
+    private static PreviewPasswordBox_LostFocus(sender: any, e: any): void {//hulei-s 密码控件处理需要重写
         if (SystemFunction.Len(sender.Password) !== 6) {
             sender.ShowTip("请输入6位密码!");
             sender.Password = "";
@@ -188,10 +191,10 @@ class Encrypte {
                         if (Encrypte.GetEncrypteType(sender)) {
                             res = EncrypteHandle.EncrypteUnion_GM(accountNo, sender.Password.trim(), legalPwdKey, encrypteType);
                         } else {
-                            res = EncrypteHandle.EncrypteUnion(accountNo, sender.Password.trim());
+                            res = EncrypteHandle.EncrypteUnion(accountNo, sender.Password.trim(), "");
                         }
                     } else {
-                        res = EncrypteHandle.EncrypteUnion(accountNo, sender.Password.trim());
+                        res = EncrypteHandle.EncrypteUnion(accountNo, sender.Password.trim(), "");
                     }
                     break;
             }

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/TradeAttach/ExamSystem.ts

@@ -1,9 +1,7 @@
 // 假设这些类型和类在其他地方定义
-interface ConfigManager {
-    static GetInstance(): {
-        GetConfigValue(key: string, configType: any): string;
-    };
-}
+
+import { ConfigManager } from "@/views/front/platfrom/common/RunningParameters/ConfigManager";
+
 
 interface ExamObject {
     IsExamModel: boolean;
@@ -32,8 +30,8 @@ enum CommniucationFlag {
 class ExamSystem {
     private static _instance: ExamSystem;
     private constructor() {
-        this.InExamMode = ConfigManager.GetInstance().GetConfigValue("InExamMode", 'System').toLowerCase() === 'true';
-        this.ExamEntity = { IsExamModel: this.InExamMode };
+        // this.InExamMode = ConfigManager.GetInstance().GetConfigValue("InExamMode", 'System').toLowerCase() === 'true';
+        // this.ExamEntity = { IsExamModel: this.InExamMode };hulei-/考试系统相关暂时也不改动
     }
 
     public static get Instance(): ExamSystem {
@@ -52,7 +50,7 @@ class ExamSystem {
         return this._submitExamCommand ?? (this._submitExamCommand = (obj) => {
             if (!this.InExamMode) return;
             // 模拟 Process.GetProcessesByName
-            const isProcessRunning = false; 
+            const isProcessRunning = false;
             if (!isProcessRunning) {
                 try {
                     // 模拟文件操作
@@ -149,4 +147,4 @@ class ExamSystem {
     }
 }
 
-export default ExamSystem;
+export default ExamSystem;

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeExtension/TradeAttach/InputDevice.ts

@@ -28,7 +28,7 @@ interface DeviceEntity<T> {
     Data?: T;
 }
 
-interface PassWordEntity {}
+interface PassWordEntity { }
 
 class DeviceHelper {
     static FingerIsMatch(fingerUser: string): DeviceEntity<any> {
@@ -68,7 +68,7 @@ class InputDevice {
 
     constructor(tb: TextBox) {
         this.Target = tb;
-        this.ParentPage = tb.FindVisualTreeAncestor(x => x instanceof IPage) as IPage;
+        // this.ParentPage = tb.FindVisualTreeAncestor(x => x instanceof IPage) as IPage;
     }
 
     static GetInput(obj: TextBox): InputMode {
@@ -202,4 +202,4 @@ class InputDevice {
     }
 }
 
-export { InputDevice, InputMode, DeviceType };
+export { InputDevice, InputMode, DeviceType };

ant-design-pro-vue3/src/views/front/develop/Library.Ext/TradeInterface/MainPage/MainPageManager.ts

@@ -1,5 +1,6 @@
 // 模拟 IMainPage 接口
 interface IMainPage {
+    AddForceNotifyPlan(target: any): unknown;
     // 这里可以根据实际情况添加接口方法
 }
 
@@ -34,4 +35,4 @@ class MainPageManager {
     }
 }
 
-export { MainPageManager, IMainPage };
+export { MainPageManager, IMainPage };

ant-design-pro-vue3/src/views/front/develop/Library.Ext/Variables/UserVariable.ts

@@ -1,3 +1,5 @@
+import { List } from "ant-design-vue";
+
 // 定义 KeyValuePair 类型
 type KeyValuePair = { key: string; value: string };
 
@@ -37,6 +39,9 @@ class SelectionManager {
 
 // 定义 UserVariable 类
 class UserVariable {
+    static GetCardBin(target: any) {
+        return null;
+    }
     static GetYorN(): KeyValuePair[] {
         return [
             { key: "是", value: "Y" },
@@ -145,11 +150,11 @@ class UserVariable {
         ];
     }
 
-    static GetCurNo(): KeyValuePair[] {
-        return [
-            { key: "人民币", value: "01" }
-        ];
-    }
+    // static GetCurNo(): KeyValuePair[] {
+    //     return [
+    //         { key: "人民币", value: "01" }
+    //     ];
+    // }hulei-/
 
     static GetCurNo_WB(): KeyValuePair[] {
         return SelectionManager.Instance.PullSelection("CUR_NO", null);
@@ -199,4 +204,4 @@ class UserVariable {
 }
 
 // 导出 UserVariable 类
-export default UserVariable;
+export default UserVariable;

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/ServiceHelper/ServiceEntitys.ts

@@ -1,12 +1,12 @@
-export class TransitEntity {
-  ServiceName: string = ''
-  FuncName: string = ''
-  Parameters: Record<string, string> = {}
-  AttachFiles: AttachFile[] = []
-}
+// export class TransitEntity {
+//   ServiceName: string = ''
+//   FuncName: string = ''
+//   Parameters: Record<string, string> = {}
+//   AttachFiles: AttachFile[] = []
+// }
 
-export class AttachFile {
-  AttachIndex: string = ''
-  AttachType: string = ''
-  AttachValue: any = null
-}
+// export class AttachFile {
+//   AttachIndex: string = ''
+//   AttachType: string = ''
+//   AttachValue: any = null
+// }

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/ServiceHelper/TradeHandle.ts

@@ -1,13 +1,15 @@
 import { ref } from 'vue'
 import { message } from 'ant-design-vue'
 import ServiceManager from "@/views/front/platfrom/serviceproxy/ServiceHelper/TradeHandle";
-import { TransitEntity, AttachFile } from './ServiceEntitys'
+
 import CommonFunction from "@/views/front/platfrom/serviceproxy/CommonFunction";
 import { ServiceSettings } from "@/views/front/develop/ServiceProxy.Ext/ServiceSettings"
 import FilesHandle from '@/views/front/platfrom/serviceproxy/ServiceHelper/FilesHandle';
 import { CheckInfo } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/CheckInfo';
 import { CheckResult } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/CheckResult';
 import { AuthResult } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/AuthResult';
+import TransitEntity from '@/views/front/platfrom/serviceproxy/ServiceFunction/TransitEntity';
+// import { AttachFile } from '@/views/front/platfrom/serviceproxy/ServiceFunction/AttachFile';
 
 
 export enum Transit {
@@ -39,13 +41,14 @@ export default class TradeHandle {
         }
 
         const entity = new TransitEntity()
-        entity.ServiceName = 'TradeService'
-        entity.FuncName = 'GetFdItemMap'
-        entity.Parameters = { '1': type }
+        entity.ServiceName = 'TradeService';
+        entity.FuncName = 'GetFdItemMap';
+        entity.Parameters = { '1': type };
+
+        const tmpresult = ServiceManager.GetInstance().Commit(entity)
 
-        const tmpresult = await ServiceManager.GetInstance().Commit(entity)
         let data = null
-        if (tmpresult && tmpresult.length === 1) {
+        if (tmpresult && (await tmpresult).length === 1) {
             data = tmpresult[0].AttachValue as string
         }
 
@@ -86,17 +89,17 @@ export default class TradeHandle {
                 '7': serialNo
             }
 
-            const data = new AttachFile()
-            data.AttachIndex = '2'
-            data.AttachType = 'ByteType'
-            data.AttachValue = integrateData
-            entity.AttachFiles.push(data)
+            // const data = new AttachFile()
+            // data.AttachIndex = '2'
+            // data.AttachType = 'ByteType'
+            // data.AttachValue = integrateData
+            // entity.AttachFiles.push(data)
 
-            const data1 = new AttachFile()
-            data1.AttachIndex = '5'
-            data1.AttachType = 'ByteType'
-            data1.AttachValue = fileData
-            entity.AttachFiles.push(data1)
+            // const data1 = new AttachFile()
+            // data1.AttachIndex = '5'
+            // data1.AttachType = 'ByteType'
+            // data1.AttachValue = fileData
+            // entity.AttachFiles.push(data1)
 
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult) {
@@ -132,11 +135,11 @@ export default class TradeHandle {
                 '3': 'false'
             }
 
-            const data = new AttachFile()
-            data.AttachIndex = '2'
-            data.AttachType = 'ByteType'
-            data.AttachValue = new Uint8Array(0)
-            entity.AttachFiles.push(data)
+            // const data = new AttachFile()
+            // data.AttachIndex = '2'hulei-/ 
+            // data.AttachType = 'ByteType'
+            // data.AttachValue = new Uint8Array(0)
+            // entity.AttachFiles.push(data)
 
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult && tmpresult.length === 1) {
@@ -158,11 +161,11 @@ export default class TradeHandle {
             entity.ServiceName = 'TradeService'
             entity.FuncName = 'Check'
 
-            const data = new AttachFile()
-            data.AttachIndex = '1'
-            data.AttachType = 'TableType'
-            data.AttachValue = CommonFunction.ChangeEntityToTable([inf])
-            entity.AttachFiles.push(data)
+            // const data = new AttachFile()
+            // data.AttachIndex = '1' hulei-/ 
+            // data.AttachType = 'TableType'
+            // data.AttachValue = CommonFunction.ChangeEntityToTable([inf])
+            // entity.AttachFiles.push(data)
 
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult && tmpresult.length === 1) {
@@ -207,11 +210,11 @@ export default class TradeHandle {
                 '8': refuseReason
             }
 
-            const data = new AttachFile()
-            data.AttachIndex = '7'
-            data.AttachType = 'ByteType'
-            data.AttachValue = pagedata
-            entity.AttachFiles.push(data)
+            // const data = new AttachFile()
+            // data.AttachIndex = '7'
+            // data.AttachType = 'ByteType'
+            // data.AttachValue = pagedata
+            // entity.AttachFiles.push(data)
 
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult && tmpresult.length === 1) {

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/ServiceHelper/TradeManagerHandle.ts

@@ -0,0 +1,131 @@
+
+
+import TransitEntity from '@/views/front/platfrom/serviceproxy/ServiceFunction/TransitEntity';
+import TT_KinbrInfo from '../TradeBusinessEntitys/TT_KinbrInfo';
+import { TT_LoginUser } from '../TradeBusinessEntitys/TT_LoginUser';
+// import { Types } from "@/views/front/platfrom/serviceproxy/ServiceFunction/Types";
+// import { AttachFile } from '@/views/front/platfrom/serviceproxy/ServiceFunction/AttachFile';
+
+
+
+export class TradeManagerHandle {
+    static Query_GroupCodeByUserCode(userCode: string): string[] {
+        throw new Error("Method not implemented.");
+    }
+    static GetKinbrLogo(kinbrno: string) {
+        throw new Error("Method not implemented.");
+    }
+    static GetClearingKinbrno(): string[] {
+        throw new Error("Method not implemented.");
+    }
+    static TT_SYSCONFIG_GetConfigValueByConfigID(arg0: string) {
+        return "V21";
+    }
+    // 查询机构信息
+    public static async GetAllKinbrInfo(kinbrNo: string): Promise<TT_KinbrInfo[]> {
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = "tradeManagerService",
+                entity.FuncName = "GetAllKinbrInfo",
+                entity.Parameters = { "1": kinbrNo }
+
+
+            const tmpresult = ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                return CommonFunction.changeTableToEntitys<TT_KinbrInfo>(tmpresult[0].AttachValue);
+            }
+            return [];
+        } catch (e) {
+            throw e;
+        }
+    }
+
+    // 查询柜员信息
+    public static async GetLoginuserList(kinbrno: string): Promise<TT_LoginUser[]> {
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'tradeManagerService'
+            entity.FuncName = 'tradeManagerService'
+            entity.Parameters = { "1": kinbrno }
+
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                return CommonFunction.changeTableToEntitys<TT_LoginUser>(tmpresult[0].AttachValue);
+            }
+            return [];
+        } catch (e) {
+            throw e;
+        }
+    }
+
+    // 获取机构类型
+    public static async GetKinbrtypeByKinbrno(kinbrno: string): Promise<string> {
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'tradeManagerService',
+                entity.FuncName = "GetKinbrtypeByKinbrno",
+                entity.Parameters = { "1": kinbrno }
+
+
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                return tmpresult[0].AttachValue.toString();
+            }
+            return "";
+        } catch (e) {
+            throw e;
+        }
+    }
+
+    // 机构同步
+    public static async tt_kinbrinfo_Sync(
+        deletelist: string,
+        add: TT_KinbrInfo[],
+        update: TT_KinbrInfo[]
+    ): Promise<string> {
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'tradeManagerService',
+                entity.FuncName = "TT_kinbrinfo_Sync",
+                entity.Parameters = { "1": deletelist }
+            // entity.AttachFiles.push(new AttachFile({
+            //     AttachIndex: "2",
+            //     AttachType: Types.TableType,
+            //     AttachValue: CommonFunction.changeEntityToTable(add)
+            // }));
+
+            // entity.AttachFiles.push(new AttachFile({
+            //     AttachIndex: "3",
+            //     AttachType: Types.TableType,
+            //     AttachValue: CommonFunction.changeEntityToTable(update)
+            // }));hulei-/暂时不加附件 后面再说
+
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                return tmpresult[0].AttachValue.toString();
+            }
+            return "9999";
+        } catch (e) {
+            throw e;
+        }
+    }
+
+    // 其他方法实现类似，根据业务需求补充...
+}
+
+// 辅助函数类
+class CommonFunction {
+    public static changeTableToEntitys<T>(table: any): T[] {
+        // 实现DataTable到实体数组的转换
+        return [];
+    }
+
+    public static changeEntityToTable(entities: any[]): any {
+        // 实现实体数组到DataTable的转换
+        return {};
+    }
+
+    public static changArrayToStr(arr: string[]): string {
+        return arr.join(",");
+    }
+}

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/PageFunctions/TradeModel.ts

@@ -1,7 +1,7 @@
 // 假设 NotificationObject 类的定义如下
 class NotificationObject {
     protected raisePropertyChanged(propertyName: string) {
-        // 这里可以实现属性变更通知的逻辑
+        // 这里可以实现属性变更通知的逻辑hulei-s 实现
         console.log(`Property ${propertyName} has changed.`);
     }
 }
@@ -106,4 +106,4 @@ class TradeModel extends NotificationObject {
     }
 }
 
-export default TradeModel;
+export default TradeModel;

ant-design-pro-vue3/src/views/front/platfrom/common/RunningParameters/PlatformSettings.ts

@@ -23,7 +23,7 @@ enum ConfigType {
 }
 
 
-export class PlatformSettings {
+export default class PlatformSettings {
     private static _encoding: BufferEncoding;
 
     /**

ant-design-pro-vue3/src/views/front/platfrom/presentation/Interfaces/Ipage.ts

@@ -1,10 +1,12 @@
 // 定义 Disposable 接口，模拟 C# 的 IDisposable
-interface Disposable {
-    dispose(): void;
-}
+// interface Disposable {
+//     dispose(): void;hulei-swindows系统的东西
+// }
+
+import { PageContainer } from "../PageFunctions/PageContainer";
 
-// 假设 PageContainer 类型定义
-class PageContainer { }
+// // 假设 PageContainer 类型定义
+// class PageContainer { }
 
 // 定义 IPage 接口
 export interface IPage extends Disposable {

ant-design-pro-vue3/src/views/front/platfrom/presentation/PageFunctions/TradePage.ts

@@ -1,56 +1,28 @@
-// 定义相关类型
-interface TradeModel {}
-interface PageContainer {}
-interface IPage {
-    Dispose(): void;
-    OwnerContainer: PageContainer;
-    SetOwnerContainer(pageContainer: PageContainer): void;
-    InstanceId: string;
-    SetInstanceId(guid: string): void;
-    ViewStateData: { [key: string]: any };
-    SetViewStateData(viewStateData: { [key: string]: any }): void;
-}
-
-interface EventHandler {
-    (sender: any, e: any): void;
-}
+import TradeModel from "../../common/BasicFunctions/PageFunctions/TradeModel";
+import { IPage } from "../Interfaces/Ipage";
+import { PageContainerHelper } from "../PagesHelper/PageContainerHelper";
+import { PageHelper } from "../PagesHelper/PageHelper";
+import { PageContainer } from "./PageContainer";
 
-interface PropertyChangedEventHandler {
-    (sender: any, e: { propertyName: string }): void;
-}
-
-// 模拟辅助类
-class PageHelper {
-    static GetTradeModel(sender: any): TradeModel {
-        return {} as TradeModel;
-    }
-    static SetTradeModel(sender: any, value: TradeModel) {}
-    static SetOwnerPage(sender: any, page: any) {}
-    static GetViewStateData(sender: any): { [key: string]: any } {
-        return {};
-    }
-    static SetViewStateData(sender: any, viewStateData: { [key: string]: any }) {}
-}
 
-class PageContainerHelper {
-    static GetOwnerContainer(sender: any): PageContainer {
-        return {} as PageContainer;
-    }
-    static SetOwnerContainer(sender: any, pageContainer: PageContainer) {}
-    static GetInstanceId(sender: any): string {
-        return "";
-    }
-    static SetInstanceId(sender: any, guid: string) {}
-}
 
 class TradePage implements IPage {
-    private _ready: EventHandler | null = null;
-    private _propertyChanged: PropertyChangedEventHandler | null = null;
+    // private _ready: EventHandler | null = null;
+    // private _propertyChanged: PropertyChangedEventHandler | null = null;//hulei-s 微软自带
 
     constructor() {
         // 模拟加载事件
         this.triggerLoad();
     }
+    GetTradeInfoData(): unknown {
+        throw new Error("Method not implemented.");
+    }
+    dispose(): void {
+        throw new Error("Method not implemented.");
+    }
+    [Symbol.dispose](): void {
+        throw new Error("Method not implemented.");
+    }
 
     get TradeModel(): TradeModel {
         return PageHelper.GetTradeModel(this);
@@ -81,9 +53,9 @@ class TradePage implements IPage {
         this.onTradePageLoaded();
     }
 
-    protected onTradePageLoaded() {}
+    protected onTradePageLoaded() { }
 
-    Dispose() {}
+    Dispose() { }
 
     get OwnerContainer(): PageContainer {
         return PageContainerHelper.GetOwnerContainer(this);
@@ -117,7 +89,7 @@ class TradePage implements IPage {
             add: (handler: PropertyChangedEventHandler) => {
                 this._propertyChanged = handler;
             },
-            remove: (handler: PropertyChangedEventHandler) => {
+            remove: () => {
                 if (this._propertyChanged === handler) {
                     this._propertyChanged = null;
                 }
@@ -132,4 +104,4 @@ class TradePage implements IPage {
     }
 }
 
-export default TradePage;
+export default TradePage;

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceFunction/AttachFile.ts

@@ -17,4 +17,4 @@ export class AttachFile {
         this.AttachType = attachType;
         this.AttachValue = attachValue;
     }
-}
+}

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceFunction/TransitEntity.ts

@@ -1,7 +1,7 @@
 // 假设 AttachFile 类的定义如下，实际使用时需要根据具体情况修改
-class AttachFile {
-    // 这里可以添加 AttachFile 类的具体属性和方法
-}
+// class AttachFile {
+//     // 这里可以添加 AttachFile 类的具体属性和方法
+// }
 
 export default class TransitEntity {
     // 服务方法名
@@ -11,7 +11,7 @@ export default class TransitEntity {
     // 方法参数(以Dictionary方式，key为参数在方法中的位置，value为参数值)
     public Parameters: { [key: string]: string };
     // 附件列表，特殊结构(转换成table结构)与大数据byte[]参数做为附件传递
-    public AttachFiles?: AttachFile[];
+    public AttachFiles: AttachFile[];
     // 超时设置，单位ms
     public Timeout?: number;