Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-18 1e07ae89fca05453c0e14125fbef9d00f09d6794

 System/Compose/New/ComposeWinModel.cs

@@ -542,22 +542,15 @@


        if(fixedMat.Count > 0 && unfixedMat.Count  > 0)

        {

            if(isFixedBind && isUnFixedBind)

            if(isFixedBind != isUnFixedBind 
                || (isFixedBind == isUnFixedBind && fixedNoBindRecord != unfixedNoBindRecord))

            {

                return false;

                return true;

            }

            else

            {

                if (isFixedBind || isUnFixedBind)

                {

                    return true;

                }

                else

                {

                    return false;

                }

                return false;

            }

           
        }

        else if(fixedMat.Count > 0)

        {