hoeditor-web 2.0.110 → 2.0.111

package/lib/hoeditor.common.js

@@ -26081,19 +26081,18 @@ var DocController = /*#__PURE__*/function () {
       if (node instanceof _treeNode_TextNode__WEBPACK_IMPORTED_MODULE_27__/* .TextNode */ .R && parentNode instanceof _treeNode_TextInputFieldNode__WEBPACK_IMPORTED_MODULE_46__/* .TextInputFieldNode */ .re && parentNode.inputFieldType == 1 && isResetFieldText) {
         var firstPath = parentNode.StartMarkNode.getNodePath();
         var lastPath = parentNode.EndMarkNode.getNodePath();
-
-        if (curRange.isEmpty) {
-          var ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
-          curRange.startPath = firstPath;
-          curRange.endPath = ePath;
-        }
-
-        if (!curRange.isEmpty && curRange.endPath == lastPath) {
-          var _ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
-
-          curRange.startPath = firstPath;
-          curRange.endPath = _ePath;
-        }
+        var ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf());
+        curRange.startPath = firstPath;
+        curRange.endPath = ePath; // if (curRange.isEmpty) {
+        //   const ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf() as BaseNode);
+        //   curRange.startPath=firstPath;
+        //   curRange.endPath = ePath;
+        // }
+        // if (!curRange.isEmpty && curRange.endPath == lastPath) {
+        //   const ePath = hoEditorFactory.docTree.getNodeLastPath(parentNode.EndMarkNode.previousLeaf() as BaseNode);
+        //   curRange.startPath = firstPath;
+        //   curRange.endPath = ePath;
+        // }
       }
 
       var isError;
@@ -36170,77 +36169,77 @@ var CombineStyle = /*#__PURE__*/function () {
 
       if (fontSize === 5.5) {
         //七号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(1.94, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(1.94, false);
       }
 
       if (fontSize === 6.5) {
         //小六
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.29, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(2.29, false);
       }
 
       if (fontSize === 7.5) {
         //六号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(2.65, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(2.65, false);
       }
 
       if (fontSize === 9) {
         //小五
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.18, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(3.18, false);
       }
 
       if (fontSize === 10.5 || fontSize === 10) {
         //五号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(3.70, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(3.70, false);
       }
 
       if (fontSize === 12) {
         //小四
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.23, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(4.23, false);
       }
 
       if (fontSize === 14) {
         //四号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(4.94, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(4.94, false);
       }
 
       if (fontSize === 15) {
         //小三
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.29, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(5.29, false);
       }
 
       if (fontSize === 16) {
         //三号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(5.64, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(5.64, false);
       }
 
       if (fontSize === 18) {
         //小二
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(6.35, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(6.35, false);
       }
 
       if (fontSize === 22) {
         //二号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(7.76, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(7.76, false);
       }
 
       if (fontSize === 24) {
         //小一
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(8.47, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(8.47, false);
       }
 
       if (fontSize === 26) {
         //一号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(9.17, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(9.17, false);
       }
 
       if (fontSize === 36) {
         //小初
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(12.7, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(12.7, false);
       }
 
       if (fontSize === 42) {
         //初号
-        fontHeight = _HOEditorFactorys__WEBPACK_IMPORTED_MODULE_13__/* .HOEditorFactorys.instance */ .b.instance().getFactory(this._hoEditorFactoryID).unitConvert.mmConversionPx(14.82, false);
+        fontHeight = hoeditfactory.unitConvert.mmConversionPx(14.82, false);
       }
 
       return fontHeight;
@@ -40723,8 +40722,8 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     _this._keyValue = ""; //选中项的key值
 
     _this._downListContent = []; //列表内容
+    //private _bandDataSource = new BandDataSource();
 
-    _this._bandDataSource = new BandDataSource();
     _this._charSpace = 0;
     _this._value = ""; //选中项的value值
 
@@ -40839,16 +40838,18 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
 
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
-          if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target[value]) == "object") {
-            if (Object.prototype.toString.call(source[value]) === "[object Object]") {
-              assignvalue(target[value], source[value]);
-            } else {
-              if (source[value] !== "" && source[value] !== null) {
-                assignvalue(target[value], eval("(" + source[value] + ")"));
+          if (value != "dataSource") {
+            if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target[value]) == "object") {
+              if (Object.prototype.toString.call(source[value]) === "[object Object]") {
+                assignvalue(target[value], source[value]);
+              } else {
+                if (source[value] !== "" && source[value] !== null) {
+                  assignvalue(target[value], eval("(" + source[value] + ")"));
+                }
               }
+            } else {
+              target[value] = source[value];
             }
-          } else {
-            target[value] = source[value];
           }
         });
       };
@@ -40938,17 +40939,15 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
     //     this._valuesObject = value;
     //   }
     // }
+    // get bandDataSource(): BandDataSource {
+    //   return this._bandDataSource;
+    // }
+    // set bandDataSource(value: BandDataSource) {
+    //   if (this._bandDataSource !== value) {
+    //     this._bandDataSource = value;
+    //   }
+    // }
 
-  }, {
-    key: "bandDataSource",
-    get: function get() {
-      return this._bandDataSource;
-    },
-    set: function set(value) {
-      if (this._bandDataSource !== value) {
-        this._bandDataSource = value;
-      }
-    }
   }, {
     key: "charSpace",
     get: function get() {
@@ -40972,8 +40971,8 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
       ret.TipText = this.tipText !== undefined ? this.tipText : ret.TipText;
       ret.IsAllowDelete = this.isAllowDelete !== undefined ? this.isAllowDelete : ret.IsAllowDelete;
       ret.AllowMultiSelect = this.allowMultiSelect !== undefined ? this.allowMultiSelect : ret.AllowMultiSelect;
-      ret.IsReadOnly = this.isReadOnly !== undefined ? this.isReadOnly : ret.IsReadOnly;
-      ret.BandDataSource = this.bandDataSource;
+      ret.IsReadOnly = this.isReadOnly !== undefined ? this.isReadOnly : ret.IsReadOnly; //ret.BandDataSource = this.bandDataSource;
+
       return ret;
     }
   }, {
@@ -41172,7 +41171,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
           allowMultiSelect: this.allowMultiSelect,
           readType: this.readType,
           downLists: downLists,
-          dataSource: this.bandDataSource,
+          //dataSource: this.bandDataSource,
           remark: this.remark,
           customProperty: this.customProperty
         };
@@ -41208,7 +41207,7 @@ var DownListNode = /*#__PURE__*/function (_ControlNode) {
         allowMultiSelect: this.allowMultiSelect,
         readType: this.readType,
         downLists: downLists,
-        dataSource: this.bandDataSource,
+        //dataSource: this.bandDataSource,
         remark: this.remark,
         customProperty: this.customProperty
       };
@@ -46313,7 +46312,7 @@ var RadioAndCheckBoxNode = /*#__PURE__*/function (_ControlNode) {
 
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
-          if (value !== "appendText") {
+          if (value !== "appendText" && value != "bandDataSource") {
             if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(target[value]) == "object") {
               if (Object.prototype.toString.call(source[value]) === "[object Object]") {
                 assignvalue(target[value], source[value]);
@@ -52161,7 +52160,7 @@ var TableNode = /*#__PURE__*/function (_RectNode) {
 /*
  * @Author: your name
  * @Date: 2020-11-03 15:17:54
- * @LastEditTime: 2022-10-14 17:24:29
+ * @LastEditTime: 2022-10-18 09:36:56
  * @LastEditors: liyanan 2441631434@qq.com
  * @Description: In User Settings Edit
  * @FilePath: \hoeditor-web\src\editor\dom\treeNode\TextInputFieldNode.ts
@@ -52752,25 +52751,30 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     key: "setValuesObject",
     value: function setValuesObject(valuesObject) {
       // const valuesObj = eval("(" + valuesObject + ")");
+      console.time("".concat(valuesObject.name, "--setValuesObject"));
       var valuesObj = valuesObject;
 
       var assignvalue = function assignvalue(target, source) {
         Object.keys(source).forEach(function (value) {
-          if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(target[value]) == 'object') {
-            if (Object.prototype.toString.call(source[value]) === '[object Object]') {
-              assignvalue(target[value], source[value]);
-            } else {
-              if (source[value] !== '' && source[value] !== null) {
-                assignvalue(target[value], eval('(' + source[value] + ')'));
+          if (value != "childNodes" && value != "bandDataSource") {
+            if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(target[value]) == 'object') {
+              if (Object.prototype.toString.call(source[value]) === '[object Object]') {
+                assignvalue(target[value], source[value]);
+              } else {
+                if (source[value] !== '' && source[value] !== null) {
+                  // assignvalue(target[value], eval('(' +  + ')'));
+                  assignvalue(target[value], JSON.parse(source[value]));
+                }
               }
+            } else {
+              target[value] = source[value];
             }
-          } else {
-            target[value] = source[value];
           }
         });
       };
 
       assignvalue(this, valuesObj);
+      console.timeEnd("".concat(valuesObject.name, "--setValuesObject"));
     }
   }, {
     key: "mouseEvent",
@@ -52873,11 +52877,9 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
     },
     set: function set(value) {
       if (this._labelText !== value) {
-        this._labelText = value;
-
-        if (this.text === '') {
-          this.node2DrawNodeRange(0, 0);
-        }
+        this._labelText = value; // if (this.text === '') {
+        //     this.node2DrawNodeRange(0, 0);
+        // }
       }
     }
   }, {
@@ -54389,8 +54391,10 @@ var TextInputFieldNode = /*#__PURE__*/function (_BaseCombineNode) {
                       }
                     }
                   } else {
-                    var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
-                    temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                    if (textArr[0] != "") {
+                      var textNode1 = new _TextNode__WEBPACK_IMPORTED_MODULE_55__/* .TextNode */ .R(hoEditorFactoryID, rootNodes, temp, _BaseNode__WEBPACK_IMPORTED_MODULE_40__/* .NodeType.ntText */ .Jq.ntText, textArr[0], styleIndex);
+                      temp.childNodes.splice(temp.childNodes.length - 1, 0, textNode1);
+                    }
                   }
 
                   if (textArr.length > 1) {
@@ -119026,7 +119030,7 @@ this.clear();}var p=Graphics.prototype;var G=Graphics;// shortcut
 	 * @static
 	 * @protected
 	 * @type {CanvasRenderingContext2D}
-	 **/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){Graphics._ctx=canvas.getContext("2d");canvas.width=canvas.height=1;}// getter / setters:
+	 **/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){Graphics._ctx=canvas.getContext("2d",{willReadFrequently:true});canvas.width=canvas.height=1;}// getter / setters:
 /**
 	 * Use the {{#crossLink "Graphics/instructions:property"}}{{/crossLink}} property instead.
 	 * @method _getInstructions
@@ -120606,7 +120610,7 @@ this.createjs=this.createjs||{};(function(){"use strict";// constructor:
 	 * @static
 	 * @protected
 	 **/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");// prevent errors on load in browsers without canvas.
-if(canvas.getContext){DisplayObject._hitTestCanvas=canvas;DisplayObject._hitTestContext=canvas.getContext("2d");canvas.width=canvas.height=1;}// events:
+if(canvas.getContext){DisplayObject._hitTestCanvas=canvas;DisplayObject._hitTestContext=canvas.getContext("2d",{willReadFrequently:true});canvas.width=canvas.height=1;}// events:
 /**
 	 * Dispatched when the user presses their left mouse button over the display object. See the 
 	 * {{#crossLink "MouseEvent"}}{{/crossLink}} class for a listing of event properties.
@@ -121653,7 +121657,7 @@ this.enableDOMEvents(true);}var p=createjs.extend(Stage,createjs.Container);// e
 	 *
 	 * @method update
 	 * @param {Object} [props] Props object to pass to `tick()`. Should usually be a {{#crossLink "Ticker"}}{{/crossLink}} event object, or similar object with a delta property.
-	 **/p.update=function(props){if(!this.canvas){return;}if(this.tickOnUpdate){this.tick(props);}if(this.dispatchEvent("drawstart",false,true)===false){return;}createjs.DisplayObject._snapToPixelEnabled=this.snapToPixelEnabled;var r=this.drawRect,ctx=this.canvas.getContext("2d");ctx.setTransform(1,0,0,1,0,0);if(this.autoClear){if(r){ctx.clearRect(r.x,r.y,r.width,r.height);}else{ctx.clearRect(0,0,this.canvas.width+1,this.canvas.height+1);}}ctx.save();if(this.drawRect){ctx.beginPath();ctx.rect(r.x,r.y,r.width,r.height);ctx.clip();}this.updateContext(ctx);this.draw(ctx,false);ctx.restore();this.dispatchEvent("drawend");};/**
+	 **/p.update=function(props){if(!this.canvas){return;}if(this.tickOnUpdate){this.tick(props);}if(this.dispatchEvent("drawstart",false,true)===false){return;}createjs.DisplayObject._snapToPixelEnabled=this.snapToPixelEnabled;var r=this.drawRect,ctx=this.canvas.getContext("2d",{willReadFrequently:true});ctx.setTransform(1,0,0,1,0,0);if(this.autoClear){if(r){ctx.clearRect(r.x,r.y,r.width,r.height);}else{ctx.clearRect(0,0,this.canvas.width+1,this.canvas.height+1);}}ctx.save();if(this.drawRect){ctx.beginPath();ctx.rect(r.x,r.y,r.width,r.height);ctx.clip();}this.updateContext(ctx);this.draw(ctx,false);ctx.restore();this.dispatchEvent("drawend");};/**
 	 * Propagates a tick event through the display list. This is automatically called by {{#crossLink "Stage/update"}}{{/crossLink}}
 	 * unless {{#crossLink "Stage/tickOnUpdate:property"}}{{/crossLink}} is set to false.
 	 *
@@ -121696,7 +121700,7 @@ this.enableDOMEvents(true);}var p=createjs.extend(Stage,createjs.Container);// e
 	 **/p.handleEvent=function(evt){if(evt.type=="tick"){this.update(evt);}};/**
 	 * Clears the target canvas. Useful if {{#crossLink "Stage/autoClear:property"}}{{/crossLink}} is set to `false`.
 	 * @method clear
-	 **/p.clear=function(){if(!this.canvas){return;}var ctx=this.canvas.getContext("2d");ctx.setTransform(1,0,0,1,0,0);ctx.clearRect(0,0,this.canvas.width+1,this.canvas.height+1);};/**
+	 **/p.clear=function(){if(!this.canvas){return;}var ctx=this.canvas.getContext("2d",{willReadFrequently:true});ctx.setTransform(1,0,0,1,0,0);ctx.clearRect(0,0,this.canvas.width+1,this.canvas.height+1);};/**
 	 * Returns a data url that contains a Base64-encoded image of the contents of the stage. The returned data url can
 	 * be specified as the src value of an image element.
 	 * @method toDataURL
@@ -122387,7 +122391,7 @@ this._webGLContext.clearColor(this._clearColor.r,this._clearColor.g,this._clearC
 	 * Docced in superclass
 	 */p.update=function(props){if(!this.canvas){return;}if(this.tickOnUpdate){this.tick(props);}this.dispatchEvent("drawstart");if(this.autoClear){this.clear();}if(this._webGLContext){// Use WebGL.
 this._batchDraw(this,this._webGLContext);if(this._autoPurge!=-1&&!(this._drawID%(this._autoPurge/2|0))){this.purgeTextures(this._autoPurge);}}else{// Use 2D.
-var ctx=this.canvas.getContext("2d");ctx.save();this.updateContext(ctx);this.draw(ctx,false);ctx.restore();}this.dispatchEvent("drawend");};/**
+var ctx=this.canvas.getContext("2d",{willReadFrequently:true});ctx.save();this.updateContext(ctx);this.draw(ctx,false);ctx.restore();}this.dispatchEvent("drawend");};/**
 	 * Docced in superclass
 	 */p.clear=function(){if(!this.canvas){return;}if(StageGL.isWebGLActive(this._webGLContext)){var gl=this._webGLContext;var cc=this._clearColor;var adjust=this._transparent?cc.a:1.0;// Use WebGL settings; adjust for pre multiplied alpha appropriate to scenario
 this._webGLContext.clearColor(cc.r*adjust,cc.g*adjust,cc.b*adjust,adjust);gl.clear(gl.COLOR_BUFFER_BIT);this._webGLContext.clearColor(cc.r,cc.g,cc.b,cc.a);}else{// Use 2D.
@@ -123293,7 +123297,7 @@ this.createjs=this.createjs||{};(function(){"use strict";// constructor:
 	 * @property _workingContext
 	 * @type CanvasRenderingContext2D
 	 * @private
-	 **/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){Text._workingContext=canvas.getContext("2d");canvas.width=canvas.height=1;}// constants:
+	 **/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){Text._workingContext=canvas.getContext("2d",{willReadFrequently:true});canvas.width=canvas.height=1;}// constants:
 /**
 	 * Lookup table for the ratio to offset bounds x calculations based on the textAlign property.
 	 * @property H_OFFSETS
@@ -123954,7 +123958,7 @@ this.createjs=this.createjs||{};(function(){"use strict";// constructor:
 	 * @static
 	 * @type CanvasRenderingContext2D
 	 * @protected
-	*/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){SpriteSheetUtils._workingCanvas=canvas;SpriteSheetUtils._workingContext=canvas.getContext("2d");canvas.width=canvas.height=1;}// public static methods:
+	*/var canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");if(canvas.getContext){SpriteSheetUtils._workingCanvas=canvas;SpriteSheetUtils._workingContext=canvas.getContext("2d",{willReadFrequently:true});canvas.width=canvas.height=1;}// public static methods:
 /**
 	 * Returns a single frame of the specified sprite sheet as a new PNG image. An example of when this may be useful is
 	 * to use a spritesheet frame as the source for a bitmap fill.
@@ -124203,7 +124207,7 @@ SpriteSheetBuilder.ERR_DIMENSIONS="frame dimensions exceed max spritesheet dimen
 	 * @method _drawNext
 	 * @protected
 	 * @return Boolean Returns false if this is the last draw.
-	 **/p._drawNext=function(){var frame=this._frames[this._index];var sc=frame.scale*this._scale;var rect=frame.rect;var sourceRect=frame.sourceRect;var canvas=this._data.images[frame.img];var ctx=canvas.getContext("2d");frame.funct&&frame.funct(frame.source,frame.data);ctx.save();ctx.beginPath();ctx.rect(rect.x,rect.y,rect.width,rect.height);ctx.clip();ctx.translate(Math.ceil(rect.x-sourceRect.x*sc),Math.ceil(rect.y-sourceRect.y*sc));ctx.scale(sc,sc);frame.source.draw(ctx);// display object will draw itself.
+	 **/p._drawNext=function(){var frame=this._frames[this._index];var sc=frame.scale*this._scale;var rect=frame.rect;var sourceRect=frame.sourceRect;var canvas=this._data.images[frame.img];var ctx=canvas.getContext("2d",{willReadFrequently:true});frame.funct&&frame.funct(frame.source,frame.data);ctx.save();ctx.beginPath();ctx.rect(rect.x,rect.y,rect.width,rect.height);ctx.clip();ctx.translate(Math.ceil(rect.x-sourceRect.x*sc),Math.ceil(rect.y-sourceRect.y*sc));ctx.scale(sc,sc);frame.source.draw(ctx);// display object will draw itself.
 ctx.restore();return++this._index<this._frames.length;};createjs.SpriteSheetBuilder=createjs.promote(SpriteSheetBuilder,"EventDispatcher");})();//##############################################################################
 // DOMElement.js
 //##############################################################################
@@ -124674,7 +124678,7 @@ if(!stageGL.isCacheControlled){stageGL.getTargetRenderTexture(this.target,this._
 	 * @protected
 	 **/p._drawToCache=function(compositeOperation){var surface=this.target.cacheCanvas;var target=this.target;var webGL=this._webGLCache;if(webGL){//TODO: auto split blur into an x/y pass
 webGL.cacheDraw(target,target.filters,this);// we may of swapped around which element the surface is, so we re-fetch it
-surface=this.target.cacheCanvas;surface.width=this._drawWidth;surface.height=this._drawHeight;}else{var ctx=surface.getContext("2d");if(!compositeOperation){ctx.clearRect(0,0,this._drawWidth+1,this._drawHeight+1);}ctx.save();ctx.globalCompositeOperation=compositeOperation;ctx.setTransform(this.scale,0,0,this.scale,-this._filterOffX,-this._filterOffY);ctx.translate(-this.x,-this.y);target.draw(ctx,true);ctx.restore();if(target.filters&&target.filters.length){this._applyFilters(ctx);}}surface._invalid=true;};/**
+surface=this.target.cacheCanvas;surface.width=this._drawWidth;surface.height=this._drawHeight;}else{var ctx=surface.getContext("2d",{willReadFrequently:true});if(!compositeOperation){ctx.clearRect(0,0,this._drawWidth+1,this._drawHeight+1);}ctx.save();ctx.globalCompositeOperation=compositeOperation;ctx.setTransform(this.scale,0,0,this.scale,-this._filterOffX,-this._filterOffY);ctx.translate(-this.x,-this.y);target.draw(ctx,true);ctx.restore();if(target.filters&&target.filters.length){this._applyFilters(ctx);}}surface._invalid=true;};/**
 	 * Work through every filter and apply its individual visual transformation.
 	 * @method _applyFilters
 	 * @protected
@@ -124814,7 +124818,7 @@ this.createjs=this.createjs||{};(function(){"use strict";// constructor:
 var data=imageData.data;var map=this._mapData;for(var i=0,l=data.length;i<l;i+=4){data[i+3]=map[i]||0;}return true;};/**
 	 * @method _prepAlphaMap
 	 * @protected
-	 **/p._prepAlphaMap=function(){if(!this.alphaMap){return false;}if(this.alphaMap==this._alphaMap&&this._mapData){return true;}this._mapData=null;var map=this._alphaMap=this.alphaMap;var canvas=map;var ctx;if(map instanceof HTMLCanvasElement){ctx=canvas.getContext("2d");}else{canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");canvas.width=map.width;canvas.height=map.height;ctx=canvas.getContext("2d");ctx.drawImage(map,0,0);}try{var imgData=ctx.getImageData(0,0,map.width,map.height);}catch(e){//if (!this.suppressCrossDomainErrors) throw new Error("unable to access local image data: " + e);
+	 **/p._prepAlphaMap=function(){if(!this.alphaMap){return false;}if(this.alphaMap==this._alphaMap&&this._mapData){return true;}this._mapData=null;var map=this._alphaMap=this.alphaMap;var canvas=map;var ctx;if(map instanceof HTMLCanvasElement){ctx=canvas.getContext("2d",{willReadFrequently:true});}else{canvas=createjs.createCanvas?createjs.createCanvas():document.createElement("canvas");canvas.width=map.width;canvas.height=map.height;ctx=canvas.getContext("2d",{willReadFrequently:true});ctx.drawImage(map,0,0);}try{var imgData=ctx.getImageData(0,0,map.width,map.height);}catch(e){//if (!this.suppressCrossDomainErrors) throw new Error("unable to access local image data: " + e);
 return false;}this._mapData=imgData.data;return true;};createjs.AlphaMapFilter=createjs.promote(AlphaMapFilter,"Filter");})();//##############################################################################
 // AlphaMaskFilter.js
 //##############################################################################
@@ -214894,7 +214898,7 @@ var SignNode = __webpack_require__(34450);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(14208);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.110');
+/* harmony default export */ var version = ('2.0.111');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(44523);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -220903,53 +220907,51 @@ var StructureConvert = /*#__PURE__*/function () {
         var formularNodes = hoEditorFactory.drawTree.formularNodes;
         var tableArr = [];
         formularNodes.forEach(function (value, key) {
-          if ( //value.formularType === FormularType.ftSum
-          //|| value.formularType === FormularType.ftFormular
-          value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping) {
+          if (value.formularType === TableFormula/* FormularType.ftSum */.a.ftSum || value.formularType === TableFormula/* FormularType.ftFormular */.a.ftFormular || value.formularType === TableFormula/* FormularType.ftBMI */.a.ftBMI || value.formularType === TableFormula/* FormularType.ftLaborProcess */.a.ftLaborProcess || value.formularType === TableFormula/* FormularType.ftExpectedBirthDate */.a.ftExpectedBirthDate || value.formularType === TableFormula/* FormularType.ftPregnantWeeks */.a.ftPregnantWeeks || value.formularType === TableFormula/* FormularType.ftScoreMapping */.a.ftScoreMapping) {
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true; // const prevNode = value.previousLeaf();
             // if (!prevNode) {
             //   throw new Error('错误的绘制位置');
             // }
-            // const startPath = hoEditorFactory.docTree.getNodeLastPath(prevNode);
-            // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
-            //   DocAction.daModifyStyle, startPath, startPath)
-            // changeEvent.oldEndPath = startPath;
-            // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
-            // changeEvent.repaintImmediate=false;
-            // hoEditorFactory.docTree.change(changeEvent);
 
             var table = value.getParentCell().table;
 
             if (!tableArr.includes(table)) {
               tableArr.push(table);
-            }
+            } // const startPath = hoEditorFactory.docTree.getNodeLastPath(prevNode);
+            // const changeEvent = new NodeChangeEvent(this._hoEditorFactoryID,
+            //   DocAction.daModifyStyle, startPath, startPath)
+            // changeEvent.oldEndPath = startPath;
+            // changeEvent.oldDrawLines = new SelectRange(this._hoEditorFactoryID).getRangeDrawLines(startPath, startPath, false)
+            // hangeEvent.repaintImmediate=false;
+            //hoEditorFactory.docTree.change(changeEvent);
+
           }
         });
 
         for (var t = 0; t < tableArr.length; t++) {
-          //const table=tableArr[t];
-          tableArr[t].update(); // const dpos = hoEditorFactory.drawTree.getDlineDrawRootLists(
-          //   table.drawTable
-          // );
-          // const mainArea = hoEditorFactory.drawPageTree.getMainRootArea(
-          //   table.drawTable.drawPageTables[0]
-          // );
-          // if (mainArea) {
-          //   let drawTop = table.drawTable.drawPageTables[0].y;
-          //   if (mainArea.contains(table.drawTable.drawPageTables[0]) && table.drawTable.drawPageTables[0] instanceof DrawPageTable
-          //     && (table.drawTable.drawPageTables[0] as DrawPageTable).table.drawTable.drawPageTables.indexOf(table.drawTable.drawPageTables[0] as DrawPageTable) > 0
-          //   ) {
-          //     drawTop = 0
-          //   }
-          //   hoEditorFactory.drawPageTree.update(
-          //     mainArea,
-          //     dpos[0].drawRoots,
-          //     drawTop,
-          //     dpos[0].index,
-          //     dpos[0].index
+          //   const table=tableArr[t];
+          tableArr[t].update(); //   const dpos = hoEditorFactory.drawTree.getDlineDrawRootLists(
+          //     table.drawTable
           //   );
-          // }
+          //   const mainArea = hoEditorFactory.drawPageTree.getMainRootArea(
+          //     table.drawTable.drawPageTables[0]
+          //   );
+          //   if (mainArea) {
+          //     let drawTop = table.drawTable.drawPageTables[0].y;
+          //     if (mainArea.contains(table.drawTable.drawPageTables[0]) && table.drawTable.drawPageTables[0] instanceof DrawPageTable
+          //       && (table.drawTable.drawPageTables[0] as DrawPageTable).table.drawTable.drawPageTables.indexOf(table.drawTable.drawPageTables[0] as DrawPageTable) > 0
+          //     ) {
+          //       drawTop = 0
+          //     }
+          //     hoEditorFactory.drawPageTree.update(
+          //       mainArea,
+          //       dpos[0].drawRoots,
+          //       drawTop,
+          //       dpos[0].index,
+          //       dpos[0].index
+          //     );
+          //   }
         } //模板加载完成后  开始加载数据集
         // if (test) {
         //   const data =hoEditorFactory.testDataSet.getTestJsonData();