Merge remote-tracking branch 'origin/dev' into dev

src/adapter/face.js

@@ -29,18 +29,24 @@ KM.registerToolbarUI('template theme', function(name) {
             $combox.appendTo(me.$container.find('.kmui-dialog-container'));
         }
     });
+    var lastState, lastValue;
     //状态反射
     me.on('interactchange', function() {
         var state = this.queryCommandState(name),
             value = this.queryCommandValue(name);
         //设置按钮状态
 
+        if (lastState != state)
             comboboxWidget.button().kmui().disabled(state == -1).active(state == 1);
 
-        if (value) {
+        if (value && value != lastValue) {
+            // 此处貌似性能很差，加入缓存
             comboboxWidget.selectItemByValue(value);
         }
 
+        lastState = state;
+        lastValue = value;
+
     });
 
     return comboboxWidget.button().addClass('kmui-combobox');

src/adapter/zoom.js

@@ -29,17 +29,23 @@ KM.registerToolbarUI( 'zoom', function ( name ) {
             $combox.appendTo( me.$container.find( '.kmui-dialog-container' ) );
         }
     } );
+    var lastState, lastValue;
     //状态反射
     me.on( 'interactchange', function () {
 
         var state = this.queryCommandState( name ),
             value = this.queryCommandValue( name );
+
+        if (state != lastState) {
             //设置按钮状态
             comboboxWidget.button().kmui().disabled( state == -1 ).active( state == 1 );
-        if ( value ) {
+        }
+        if ( value && value != lastValue ) {
             //设置label
             comboboxWidget.selectItemByLabel( value + '%' );
         }
+        lastState = state;
+        lastValue = value;
 
     } );
     //comboboxWidget.button().kmui().disabled(-1);

src/core/layout.js

@@ -209,7 +209,8 @@ kity.extendClass(Minder, {
                         .start(node, duration, 'ease')
                         .on('finish', function() {
                             // 可能性能低的时候会丢帧
-                            setTimeout(function() {
+                            clearTimeout(node._lastFixTimeout);
+                            node._lastFixTimeout = setTimeout(function() {
                                 applyMatrix(node, matrix);
                                 me.fire('layoutfinish', {
                                     node: node,

src/module/editor.receiver.js

@@ -59,7 +59,11 @@ Minder.Receiver = kity.createClass('Receiver', {
             textShape = new kity.Text();
         }
         this.textShape = textShape;
+        // techird: add cache
+        if (textShape._lastContent != textShape.getContent()) {
             this.container.innerHTML = utils.unhtml(textShape.getContent());
+            textShape._lastContent = textShape.getContent();
+        }
         return this;
     },
     setTextShapeSize: function(size) {
@@ -139,7 +143,7 @@ Minder.Receiver = kity.createClass('Receiver', {
             me.minderNode.getRenderContainer().bringTop();
             me.minderNode.render();
             //移动光标不做layout
-            if(!keymap.direction[keyCode]){
+            if(!keymap.direction[keyCode] && !orgEvt.shiftKey && !orgEvt.metaKey && orgEvt.ctrlKey){
                 clearTimeout(me.inputTextTimer);
 
                 me.inputTextTimer = setTimeout(function(){