hoeditor-web 3.1.142 → 3.1.144

package/lib/hoeditor.umd.js

@@ -9650,7 +9650,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 30900:
+/***/ 44363:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9670,7 +9670,7 @@ var es_string_includes = __webpack_require__(32023);
 var es_regexp_exec = __webpack_require__(74916);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__(15306);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5bdca97f&
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=2e927ae2&
 
 
 
@@ -10136,7 +10136,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5bdca97f&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=2e927ae2&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -10152,6 +10152,8 @@ var web_dom_collections_for_each = __webpack_require__(54747);
 var es_array_filter = __webpack_require__(57327);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(57658);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
+var es_json_stringify = __webpack_require__(38862);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__(92222);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.splice.js
@@ -12143,6 +12145,7 @@ var type = __webpack_require__(41542);
 
 
 
+
 
 
 var columns = [{
@@ -12600,13 +12603,30 @@ var columns = [{
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorId);
       var node = this.getCurrentPoperNode();
       var date = this.dateFormat(new Date(), node.controlStyle);
-      hoEditorFactory.elementController.updateDateTimeText(node, date);
+      var params = {
+        id: node.id,
+        name: node.name,
+        text: date,
+        title: node.title,
+        tipText: node.tipText,
+        isAllowDelete: node.isAllowDelete,
+        isReadOnly: node.isReadOnly,
+        controlStyle: node.controlStyle,
+        innerIdentifier: node.innerIdentifier,
+        dataMetaIdentifier: node.dataMetaIdentifier,
+        identifierFormat: node.identifierFormat,
+        notSelectTime: node.notSelectTime,
+        notReplaceElement: node.notReplaceElement,
+        readType: node.readType,
+        labelText: node.labelText,
+        customProperty: node.customProperty
+      };
+      hoEditorFactory.vueController.updateDateTime(JSON.stringify(params));
       this.$nextTick(function () {
         return _this6.handleClose();
       });
     },
     sureDate: function sureDate() {
-      var _this7 = this;
       var node = this.getCurrentPoperNode();
       var value = '';
       if (this.date == null) {
@@ -12621,11 +12641,27 @@ var columns = [{
         value = this.date;
       }
       value = value.replace(/^\s+|\s+$/g, '');
+      var params = {
+        id: node.id,
+        name: node.name,
+        text: value ? value : node.name,
+        title: node.title,
+        tipText: node.tipText,
+        isAllowDelete: node.isAllowDelete,
+        isReadOnly: node.isReadOnly,
+        controlStyle: node.controlStyle,
+        innerIdentifier: node.innerIdentifier,
+        dataMetaIdentifier: node.dataMetaIdentifier,
+        identifierFormat: node.identifierFormat,
+        notSelectTime: node.notSelectTime,
+        notReplaceElement: node.notReplaceElement,
+        readType: node.readType,
+        labelText: node.labelText,
+        customProperty: node.customProperty
+      };
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this.hoEditorId);
-      hoEditorFactory.elementController.updateDateTimeText(node, value);
-      this.$nextTick(function () {
-        return _this7.handleClose();
-      });
+      hoEditorFactory.vueController.updateDateTime(JSON.stringify(params));
+      this.handleClose();
     },
     searchList: function searchList() {
       console.time('搜索时间');
@@ -12669,12 +12705,12 @@ var columns = [{
      * 互斥列表选择
      */
     mutexSelectItemsChange: function mutexSelectItemsChange(value) {
-      var _this8 = this;
+      var _this7 = this;
       if (value.length > 0) {
         this.poperSelectList.forEach(function (v) {
           if (value.includes(v.id)) {
             v.selected = true;
-            _this8.mutexType = String(v.type);
+            _this7.mutexType = String(v.type);
           } else {
             v.selected = false;
           }
@@ -12683,7 +12719,7 @@ var columns = [{
       } else if (value.length === 0) {
         this.poperSelectList.forEach(function (v) {
           v.selected = false;
-          _this8.mutexType = '';
+          _this7.mutexType = '';
         });
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
       }
@@ -12692,7 +12728,7 @@ var columns = [{
      * 选择
      */
     selectItemsChange: function selectItemsChange(value) {
-      var _this9 = this;
+      var _this8 = this;
       if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.map(function (v, index) {
@@ -12708,13 +12744,13 @@ var columns = [{
         this.poperSelectList.map(function (v) {
           if (value.target.id == v.id) {
             v.selected = value.target.checked;
-            if (_this9.isCanSearch) {
-              if (v.selected && _this9.selectedList.filter(function (m) {
+            if (_this8.isCanSearch) {
+              if (v.selected && _this8.selectedList.filter(function (m) {
                 return m.id == v.id;
               }).length == 0) {
-                _this9.selectedList.push(v);
+                _this8.selectedList.push(v);
               } else {
-                _this9.selectedList = _this9.selectedList.filter(function (m) {
+                _this8.selectedList = _this8.selectedList.filter(function (m) {
                   return m.id != v.id;
                 });
               }
@@ -12732,7 +12768,7 @@ var columns = [{
       }
     },
     clickItemsChange: function clickItemsChange(value) {
-      var _this10 = this;
+      var _this9 = this;
       if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.map(function (v, index) {
@@ -12745,7 +12781,7 @@ var columns = [{
         var type = [];
         this.currentList.map(function (v) {
           if (value.id == v.id) {
-            if (!_this10.mutexType || _this10.mutexType == v.type) {
+            if (!_this9.mutexType || _this9.mutexType == v.type) {
               v.selected = !v.selected;
             }
           }
@@ -12759,7 +12795,7 @@ var columns = [{
       }
     },
     selectItems: function selectItems(item, index) {
-      var _this11 = this;
+      var _this10 = this;
       if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.forEach(function (v) {
@@ -12776,13 +12812,13 @@ var columns = [{
             v.selected = !v.selected;
           }
           if (v.selected) {
-            if (_this11.isCanSearch && _this11.selectedList.filter(function (m) {
+            if (_this10.isCanSearch && _this10.selectedList.filter(function (m) {
               return m.id == v.id;
             }).length == 0) {
-              _this11.selectedList.push(v);
+              _this10.selectedList.push(v);
             }
           } else {
-            if (_this11.isCanSearch) _this11.selectedList = _this11.selectedList.filter(function (m) {
+            if (_this10.isCanSearch) _this10.selectedList = _this10.selectedList.filter(function (m) {
               return m.id != v.id;
             });
           }
@@ -12793,12 +12829,12 @@ var columns = [{
     },
     // 全选
     allSelect: function allSelect() {
-      var _this12 = this;
+      var _this11 = this;
       this.selectedList = [];
       this.poperSelectList.forEach(function (v) {
         v.selected = true;
-        _this12.selectedList.push(v);
-        _this12.selectedIds.push(v.id);
+        _this11.selectedList.push(v);
+        _this11.selectedIds.push(v.id);
       });
       this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
     },
@@ -12819,7 +12855,7 @@ var columns = [{
     },
     // 选中
     sureSelect: function sureSelect(isAutoInput) {
-      var _this13 = this;
+      var _this12 = this;
       console.time('下拉选中时间');
       var text = '';
       var keyValue = '';
@@ -12863,7 +12899,7 @@ var columns = [{
               text += v.text + ',';
               textArr.push(v.text);
             }
-            if (_this13.isAllowMultiSelect && _this13.isMultiLinesDisplay && !_this13.mutexSelect) {
+            if (_this12.isAllowMultiSelect && _this12.isMultiLinesDisplay && !_this12.mutexSelect) {
               text += '\n';
             }
             keyValue += v.id + ',';
@@ -12911,7 +12947,7 @@ var columns = [{
       } else if (currentPoperNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         text = text.replace(/,/g, currentPoperNode.downListProperty.splitCharacter);
         Object.keys(this.textParam).map(function (v) {
-          _this13.textParam[v] = currentPoperNode[v];
+          _this12.textParam[v] = currentPoperNode[v];
         });
         if (text == this.textParam.name) {
           text = '';
@@ -12942,7 +12978,7 @@ var columns = [{
       // 元素联动内容延时关闭下拉选项，防止双击把光标移动到联动元素外
       if (selected.length === 1 && selected[0].text.indexOf('<元素>') !== -1) {
         this.$nextTick(function () {
-          _this13.handleClose();
+          _this12.handleClose();
         }, 100);
       } else {
         this.handleClose();
@@ -12982,11 +13018,11 @@ var columns = [{
       window.removeEventListener('keydown', this.arrowKeysController);
     },
     customRow: function customRow(record, index) {
-      var _this14 = this;
+      var _this13 = this;
       return {
         on: {
           click: function click(event) {
-            _this14.clickItemsChange(record);
+            _this13.clickItemsChange(record);
           }
         }
       };
@@ -12998,10 +13034,10 @@ var columns = [{
 });
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=script&lang=js&
  /* harmony default export */ var poperSelect_PoperSelectvue_type_script_lang_js_ = (PoperSelectvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5bdca97f&prod&lang=less&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=2e927ae2&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5bdca97f&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=2e927ae2&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -81843,6 +81879,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bg", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_dl", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_ul", void 0);
+    (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bd", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_spacing", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_docWidth", void 0);
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_charCount", void 0);
@@ -82012,6 +82049,7 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
       }
       this.drawBackColor();
       this.updateStyleByScript();
+      // this.updateBorder();
       this.drawUnderline();
       this.drawStrikeout();
       if (this.node instanceof TextNode/* TextNode */.R) {
@@ -82301,6 +82339,9 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
       if (this._textNode.dCombineStyle.script !== TextStyle/* StyleScriptType */.n$.sstnormal) {
         tmp = this._dText.clone();
         tmp.font = this.getStyle(this._textNode.dCombineStyle);
+        //   console.log(this._dText.getBounds());
+        //   console.log(this._wspace, this._dWidth, this._dHeight);
+        //   console.log(tmp);
         // rect = tmp.getBounds(); //实际大小
         this.setBounds(0, 0, this._dWidth + this._wspace, this.dHeight);
         switch (this._textNode.dCombineStyle.script) {
@@ -82317,6 +82358,26 @@ var DrawTextNode = /*#__PURE__*/function (_DrawCombineNode) {
         }
       }
     }
+  }, {
+    key: "updateBorder",
+    value: function updateBorder() {
+      if (!this._bd) this._bd = new createjs.Shape();
+      this._dWidth = this._dWidth + 20;
+      this.dWidth = this._dWidth;
+      this.setBounds(0, -this.dHeight - 5, this._dWidth * 2, this.dHeight * 2);
+      // console.log(this.dWidth, this.dHeight, '---');
+      // console.log(this._textNode.dCombineStyle);
+      // console.log(this._text);
+      this._bd.graphics.clear();
+      this._bd.graphics.beginStroke(this._textNode.dCombineStyle.color).drawRect(5,
+      //x
+      -this.dHeight - 5,
+      //y
+      this.dWidth - 5, this.dHeight * 2);
+      this._dText.x = 5;
+      this._dText.y = 0;
+      this.addChild(this._bd);
+    }
     /**
      * 功能：同getStyleKey()
      * NOTE:TextStyle.getStyleKey()中不要修改size的值
@@ -132602,7 +132663,7 @@ $({ target: 'Number', stat: true }, {
 
 /***/ }),
 
-/***/ 44363:
+/***/ 17855:
 /***/ (function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
 
 "use strict";
@@ -169652,7 +169713,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 99749,
 	"./paragraph/ParagraphDialog.vue": 58874,
 	"./poperSelect/PoperMark.vue": 20734,
-	"./poperSelect/PoperSelect.vue": 30900,
+	"./poperSelect/PoperSelect.vue": 44363,
 	"./poperTipText/PoperTipText.vue": 84531,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 31276,
@@ -208897,7 +208958,7 @@ var HoToPage_component = (0,componentNormalizer/* default */.Z)(
 // EXTERNAL MODULE: ./src/plugins/util.ts
 var plugins_util = __webpack_require__(62783);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperSelect.vue + 9 modules
-var PoperSelect = __webpack_require__(30900);
+var PoperSelect = __webpack_require__(44363);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(20734);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -210302,7 +210363,7 @@ var TextNode = __webpack_require__(27198);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.1.142');
+/* harmony default export */ var version = ('3.1.144');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(84531);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -224140,8 +224201,8 @@ var VueController = /*#__PURE__*/function () {
       if (node instanceof SignNode/* SignNode */.N && node !== null && node !== void 0 && node.drawNodes[0]) {
         var drawNode = node === null || node === void 0 ? void 0 : node.drawNodes[0];
         result = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, result), {}, {
-          ptRight: hoEditorFactory.unitConvert.pxToPt(caret.stageX + drawNode.dWidth),
-          ptLeft: result.ptX
+          ptLeft: hoEditorFactory.unitConvert.pxToPt(x - drawNode.dWidth),
+          ptRight: result.ptX
         });
         if (node.number == 0) {
           result.ptTop = result.ptY;
@@ -231014,7 +231075,7 @@ var es_typed_array_to_string = __webpack_require__(15016);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.typed-array.with.js
 var es_typed_array_with = __webpack_require__(55315);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.max-safe-integer.js
-var es_number_max_safe_integer = __webpack_require__(44363);
+var es_number_max_safe_integer = __webpack_require__(17855);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.flags.js
 var es_regexp_flags = __webpack_require__(92087);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.get-own-property-names.js