hoeditor-web 3.1.46 → 3.1.47

package/lib/hoeditor.umd.js

@@ -9491,7 +9491,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 43284:
+/***/ 1163:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9511,7 +9511,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=3e8ee4b5&
+;// 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=5e89f073&
 
 
 
@@ -9593,15 +9593,25 @@ var render = function render() {
     scopedSlots: _vm._u([{
       key: "select",
       fn: function fn(text, record, index) {
-        return [_c('a-checkbox', {
+        return [_vm.mutexSelect ? [index >= 1 && record.type != _vm.currentList[index - 1].type ? _c('p', {
+          key: index + Math.random(),
+          staticClass: "a-checkbox-mutex-line"
+        }) : _vm._e(), _c('a-checkbox', {
+          key: record.id + Math.random(),
+          attrs: {
+            "value": record.id,
+            "checked": record.selected,
+            "disabled": _vm.mutexType !== '' && _vm.mutexType != record.type
+          }
+        })] : [_c('a-checkbox', {
           key: record.id + Math.random(),
           attrs: {
             "value": record.id,
             "checked": record.selected
           }
-        })];
+        })]];
       }
-    }], null, false, 3049221295)
+    }], null, false, 2110942008)
   })] : [_c('a-table', {
     staticStyle: {
       "width": "100%"
@@ -9958,7 +9968,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=3e8ee4b5&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=5e89f073&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -12595,6 +12605,7 @@ var columns = [{
       }
     },
     clickItemsChange: function clickItemsChange(value) {
+      var _this9 = this;
       if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.map(function (v, index) {
@@ -12608,17 +12619,24 @@ var columns = [{
         this.isSelected = true;
         this.sureSelect(value.input);
       } else {
+        var type = [];
         this.currentList.map(function (v) {
           if (value.id == v.id) {
-            v.selected = !v.selected;
+            if (!_this9.mutexType || _this9.mutexType == v.type) {
+              v.selected = !v.selected;
+            }
+          }
+          if (v.selected) {
+            type.push(v.type);
           }
           return v;
         });
+        this.mutexType = type[0] ? type[0] : '';
         this.$forceUpdate();
       }
     },
     selectItems: function selectItems(item, index) {
-      var _this9 = this;
+      var _this10 = this;
       if (this.isSelected) return; // 单选时已选过不在进入选择
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.forEach(function (v) {
@@ -12635,13 +12653,13 @@ var columns = [{
             v.selected = !v.selected;
           }
           if (v.selected) {
-            if (_this9.isCanSearch && _this9.selectedList.filter(function (m) {
+            if (_this10.isCanSearch && _this10.selectedList.filter(function (m) {
               return m.id == v.id;
             }).length == 0) {
-              _this9.selectedList.push(v);
+              _this10.selectedList.push(v);
             }
           } else {
-            if (_this9.isCanSearch) _this9.selectedList = _this9.selectedList.filter(function (m) {
+            if (_this10.isCanSearch) _this10.selectedList = _this10.selectedList.filter(function (m) {
               return m.id != v.id;
             });
           }
@@ -12652,12 +12670,12 @@ var columns = [{
     },
     // 全选
     allSelect: function allSelect() {
-      var _this10 = this;
+      var _this11 = this;
       this.selectedList = [];
       this.poperSelectList.forEach(function (v) {
         v.selected = true;
-        _this10.selectedList.push(v);
-        _this10.selectedIds.push(v.id);
+        _this11.selectedList.push(v);
+        _this11.selectedIds.push(v.id);
       });
       this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
     },
@@ -12678,7 +12696,7 @@ var columns = [{
     },
     // 选中
     sureSelect: function sureSelect(isAutoInput) {
-      var _this11 = this;
+      var _this12 = this;
       console.time('下拉选中时间');
       var text = '';
       var keyValue = '';
@@ -12722,7 +12740,7 @@ var columns = [{
               text += v.text + ',';
               textArr.push(v.text);
             }
-            if (_this11.isAllowMultiSelect && _this11.isMultiLinesDisplay && !_this11.mutexSelect) {
+            if (_this12.isAllowMultiSelect && _this12.isMultiLinesDisplay && !_this12.mutexSelect) {
               text += '\n';
             }
             keyValue += v.id + ',';
@@ -12770,7 +12788,7 @@ var columns = [{
       } else if (currentPoperNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         text = text.replace(/,/g, currentPoperNode.downListProperty.splitCharacter);
         Object.keys(this.textParam).map(function (v) {
-          _this11.textParam[v] = currentPoperNode[v];
+          _this12.textParam[v] = currentPoperNode[v];
         });
         if (text == this.textParam.name) {
           text = '';
@@ -12801,7 +12819,7 @@ var columns = [{
       // 元素联动内容延时关闭下拉选项，防止双击把光标移动到联动元素外
       if (selected.length === 1 && selected[0].text.indexOf('<元素>') !== -1) {
         this.$nextTick(function () {
-          _this11.handleClose();
+          _this12.handleClose();
         }, 100);
       } else {
         this.handleClose();
@@ -12841,11 +12859,11 @@ var columns = [{
       window.removeEventListener('keydown', this.arrowKeysController);
     },
     customRow: function customRow(record, index) {
-      var _this12 = this;
+      var _this13 = this;
       return {
         on: {
           click: function click(event) {
-            _this12.clickItemsChange(record);
+            _this13.clickItemsChange(record);
           }
         }
       };
@@ -12857,10 +12875,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=3e8ee4b5&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=5e89f073&prod&lang=less&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=3e8ee4b5&prod&lang=less&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=5e89f073&prod&lang=less&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -55656,6 +55674,7 @@ var SelectRange = __webpack_require__(53901);
 
 
 
+
 /*
  * @Author: your name
  * @Date: 2020-11-11 11:04:19
@@ -55692,8 +55711,8 @@ var DrawImageNode = /*#__PURE__*/function (_DrawCombineNode) {
     (0,defineProperty/* default */.Z)((0,assertThisInitialized/* default */.Z)(_this), "_bitMap", void 0);
     var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(hoeditfactoryID);
     var bounds = hoEditorFactory.vueController.getMainBounds(dWidth, dHeight);
-    _this.dWidth = bounds.imageWidth;
-    _this.dHeight = bounds.imageHeight;
+    _this.dWidth = Number(bounds.imageWidth);
+    _this.dHeight = Number(bounds.imageHeight);
     _this._imagePath = imagePath;
     _this._markImagePath = markImagePath;
     _this._imageY = -_this.dHeight;
@@ -56160,8 +56179,8 @@ var ImageNode = /*#__PURE__*/function (_BaseNode) {
       var height = Number(json.height);
       //const scaleX = Number(json.scaleX);
       //const scaleY = Number(json.scaleY);
-      var isFormula = json.isFormula ? json.isFormula === "true" ? true : false : false;
-      var isBackFill = json.isBackFill ? json.isBackFill === "true" ? true : false : false;
+      var isFormula = json.isFormula == true || json.isFormula === "true" ? true : false;
+      var isBackFill = json.isBackFill == true || json.isBackFill === "true" ? true : false;
       var innerIdentifier = json.innerIdentifier || '';
       return new ImageNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, BaseNode/* NodeType */.Jq.ntImage, json.id, json.imageDataBase64String, width, height,
       //scaleX,
@@ -95689,7 +95708,7 @@ var toDate = function toDate(date) {
 //     if (isNaN(Date.parse(time))) return false;
 //     return true;
 // };
-var dateFormatList = ['HH:mm', 'HH:mm:ss', 'MM/dd', 'yyyy/MM/dd', 'yyyy/MM/dd HH:mm', 'yyyy/MM/dd HH:mm:ss', 'HH时mm分', 'HH时mm分ss秒', 'MM月dd日', 'yyyy年MM月dd日', 'yyyy年MM月dd日 HH时mm分', 'yyyy年MM月dd日 HH时mm分ss秒', 'MM-dd', 'yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss'];
+var dateFormatList = ['HH:mm', 'HH:mm:ss', 'MM/dd', 'yyyy/MM/dd', 'yyyy/MM/dd HH:mm', 'MM/dd HH:mm', 'yyyy/MM/dd HH:mm:ss', 'HH时mm分', 'HH时mm分ss秒', 'MM月dd日', 'yyyy年MM月dd日', 'yyyy年MM月dd日 HH时mm分', 'MM月dd日 HH时mm分', 'yyyy年MM月dd日 HH时mm分ss秒', 'MM-dd', 'yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss'];
 var dateFormatValueList = [{
   value: 'HH:mm'
 }, {
@@ -178100,7 +178119,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 99749,
 	"./paragraph/ParagraphDialog.vue": 58874,
 	"./poperSelect/PoperMark.vue": 20734,
-	"./poperSelect/PoperSelect.vue": 43284,
+	"./poperSelect/PoperSelect.vue": 1163,
 	"./poperTipText/PoperTipText.vue": 50987,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 85516,
@@ -217340,7 +217359,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__(43284);
+var PoperSelect = __webpack_require__(1163);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(20734);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -218745,7 +218764,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.46');
+/* harmony default export */ var version = ('3.1.47');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(50987);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -231398,17 +231417,16 @@ var VueController = /*#__PURE__*/function () {
     key: "getSvg",
     value: function () {
       var _getSvg = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/(0,regeneratorRuntime/* default */.Z)().mark(function _callee10() {
-        var hoEditorFactory, text;
+        var hoEditorFactory;
         return (0,regeneratorRuntime/* default */.Z)().wrap(function _callee10$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
               _context11.next = 3;
-              return hoEditorFactory.printController.createHtml();
+              return hoEditorFactory.printController.createSvg();
             case 3:
-              text = _context11.sent;
-              return _context11.abrupt("return", text);
-            case 5:
+              return _context11.abrupt("return", _context11.sent);
+            case 4:
             case "end":
               return _context11.stop();
           }
@@ -233947,6 +233965,7 @@ var VueController = /*#__PURE__*/function () {
   }, {
     key: "getElementChangeRecords",
     value: function getElementChangeRecords() {
+      var _this10 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys */.b.instance().getFactory(this._hoEditorFactoryID);
       var recordArr = new Array();
       var records = hoEditorFactory.docTree.elementChangeRecords;
@@ -233989,6 +234008,9 @@ var VueController = /*#__PURE__*/function () {
               recordArr.push(obj);
             }
           }
+        } else {
+          var id = key.split("|")[0];
+          var node = _this10.getNodeByID('all', id);
         }
       });
       return recordArr;