3697 增加界面索引

Client_PangDeRong

2018-09-21 1e91e11c774e4527d6ad2ff0e27208c36ab540b1

3697 增加界面索引

 System/Compose/New/ComposeWin.cs

@@ -67,7 +67,7 @@
        protected override void OnPreOpen()

        {

            ComposeModel.ResetModel();

            if(WindowJumpMgr.Instance.IsJumpState)

            if(WindowJumpMgr.Instance.IsJumpState && WindowJumpMgr.Instance.jumpType == 1)

            {

                if(ComposeModel.CurComposeModel != null)

                {

@@ -154,14 +154,19 @@
        {

            ComposeModel.ResetJumpToModel();

            selectModel.ClearSelectModel();

          
        }



        protected override void OnAfterClose()

        {



            if (!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

               
            }

            if(WindowJumpMgr.Instance.jumpType != 1)

            {

                ComposeModel.SetCurComposeModel(null);

            }

        }

        #endregion


 System/WindowJump/WindowJumpMgr.cs

@@ -49,7 +49,7 @@


    public bool IsJumpState { get; private set; }

    private int jumpPhase = 0;



    public int jumpType { get; private set; }

    public void GetPreAllOpenWin()

    {

        jumpPhase += 1;

@@ -79,6 +79,7 @@
    {

        IsJumpState = false;

        jumpPhase = 0;

        jumpType = 0;

        openWindows.Clear();

        jumpWinNameDict.Clear();

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;

@@ -833,6 +834,7 @@
                IsJumpState = false;

                openWindows.Clear();

                jumpWinNameDict.Clear();

                jumpType = 0;

                jumpPhase = 0;

                break;

        }

@@ -876,9 +878,9 @@


    private void SetJumpLogic<T>(int _functionalOrder = 0, bool _forceSync = true) where T : Window

    {



        string curOpenWin = typeof(T).Name;

        jumpWinNameDict.Add(jumpPhase, curOpenWin);

        jumpType = _tagWinSearchModel.Type;

        switch (_tagWinSearchModel.Type)

        {

            case 1:

@@ -921,7 +923,7 @@
        }

        DebugEx.Log("关闭界面类型：" + _tagWinSearchModel.Type);

        WindowCenter.Instance.jumpWindowCloseEvent -= CloseWindow;



        jumpType = _tagWinSearchModel.Type;

        int i = 0;

        List<string> openWinlist = null;

        switch (_tagWinSearchModel.Type)