hoeditor-web 2.0.119 → 2.0.121

package/lib/hoeditor.common.js

@@ -59395,7 +59395,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var lHeight = tempComment.lineHeight;
         for (var i = 1; i < topComments.length; i++) {
           var stageY = getStagePos(topComments[i])[1];
-          if (stageY > maxValue) {
+          if (stageY >= maxValue) {
             maxValue = stageY;
             lHeight = topComments[i].lineHeight;
             tempComment = topComments[i];
@@ -211269,7 +211269,7 @@ var SignNode = __webpack_require__(24701);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(67945);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.119');
+/* harmony default export */ var version = ('2.0.121');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(14954);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -223712,6 +223712,40 @@ var VueController = /*#__PURE__*/function () {
       var xml = XmlBeauty_xmlBeauty(xmlRoot);
       return xml; //xmlBeauty(xmlRoot);
     }
+    /**
+     * 更新护理记录
+     * @param table 表格节点
+     * @param operType 操作类型 "add"新增 "update"修改
+     * @param rowIndex 行索引 新增时传-1 修改传对应的行索引
+     * @param data json数据
+     */
+  }, {
+    key: "updateNurseRecord",
+    value: function updateNurseRecord(table, operType, rowIndex, data) {
+      var _this6 = this;
+      var keys = Object.keys(data);
+      var backfill = function backfill(r) {
+        for (var i = 0; i < keys.length; i++) {
+          var cell = table.rows[r][i];
+          if (cell) {
+            var text = data[keys[i]];
+            cell.childNodes.splice(1, cell.childNodes.length);
+            var textNode = new TextNode/* TextNode */.R(_this6._hoEditorFactoryID, table.rootNodes, cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, cell.childNodes[0].styleIndex);
+            cell.drawCell.needUpdate = true;
+            cell.childNodes.push(textNode);
+          }
+        }
+      };
+      if (operType == "add") {
+        table.insertRows(table.rowCount - 1, 1, table.rowCount - 1);
+        backfill(table.rowCount - 1);
+      }
+      if (operType == "update") {
+        if (rowIndex < 0) return;
+        backfill(rowIndex);
+      }
+      table.update();
+    }
   }]);
   return VueController;
 }();
@@ -227052,7 +227086,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,defineProperty/* default */.Z)(this, "_superiorSigns", []);
     (0,defineProperty/* default */.Z)(this, "_notAllowCrossPatiPaste", false);
     (0,defineProperty/* default */.Z)(this, "_fontSizeMap", new Map());
-    (0,defineProperty/* default */.Z)(this, "_notAllowEditInReview", false);
+    (0,defineProperty/* default */.Z)(this, "_notAllowEditInReview", true);
     this._hoEditorFactoryId = id;
   }
   (0,createClass/* default */.Z)(HOEditorFactory, [{
@@ -229368,8 +229402,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// 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/toolbar/ToolBar.vue?vue&type=template&id=4f45a086&
-var ToolBarvue_type_template_id_4f45a086_render = function render() {
+;// 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/toolbar/ToolBar.vue?vue&type=template&id=68c8ec40&
+var ToolBarvue_type_template_id_68c8ec40_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229572,8 +229606,10 @@ var ToolBarvue_type_template_id_4f45a086_render = function render() {
     });
   }), 1)], 1)], 1);
 };
-var ToolBarvue_type_template_id_4f45a086_staticRenderFns = [];
+var ToolBarvue_type_template_id_68c8ec40_staticRenderFns = [];
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
+var es_array_map = __webpack_require__(21249);
 ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoMedicalExpression.tsx
 
 /* harmony default export */ var HoMedicalExpression = (external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
@@ -230105,8 +230141,6 @@ var ToolBarvue_type_template_id_4f45a086_staticRenderFns = [];
     })])])])])])]);
   }
 }));
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
-var es_array_map = __webpack_require__(21249);
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolFamily.tsx
 
 
@@ -235232,6 +235266,8 @@ var TabPane = __webpack_require__(49416);
 
 
 
+
+
 /* harmony default export */ var ToolBarvue_type_script_lang_js_ = ({
   name: 'ToolBar',
   components: {
@@ -235551,12 +235587,12 @@ var TabPane = __webpack_require__(49416);
         }
       }
     },
-    // toolbarParams: {
-    //     deep: true,
-    //     handler() {
-    //         this.handleToolbarParams();
-    //     },
-    // },
+    toolbarParams: {
+      deep: true,
+      handler: function handler() {
+        this.handleToolbarParams(true);
+      }
+    },
     // vueController: {
     //     deep: true,
     //     handler() {
@@ -235622,8 +235658,8 @@ var TabPane = __webpack_require__(49416);
       if (!this.defaultEditJson.isInsertTable) delete defaultSelect['ho-table'];
       if (!this.defaultReviewJson.isReview) delete defaultSelect['ho-review'];
       if (this.toolbarParams) {
-        this.defaultToolBarParamsText = [];
-        if (this.$slots.beforeBrowse[0]) {
+        // this.defaultToolBarParamsText = [];
+        if (this.$slots.beforeBrowse && this.$slots.beforeBrowse[0]) {
           var label = this.$slots.beforeBrowse[0].componentOptions.propsData.label;
           var name = this.$slots.beforeBrowse[0].componentOptions.propsData.name;
           this.defaultToolBarParamsText.unshift({
@@ -235634,10 +235670,24 @@ var TabPane = __webpack_require__(49416);
         this.defaultToolBarParams = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, this.defaultToolBarParams), this.toolbarParams);
         Object.keys(this.defaultToolBarParams).forEach(function (key) {
           if (defaultSelect[key]) {
-            _this2.defaultToolBarParamsText.push({
-              value: key,
-              title: defaultSelect[key]
-            });
+            if (_this2.defaultToolBarParamsText.filter(function (v) {
+              return v.value === key;
+            }).length > 0) {
+              _this2.defaultToolBarParamsText = _this2.defaultToolBarParamsText.map(function (v, index) {
+                if (index > 0 && defaultSelect[v.value] === undefined) {
+                  return undefined;
+                } else {
+                  return v;
+                }
+              }).filter(function (m) {
+                return m;
+              });
+            } else {
+              _this2.defaultToolBarParamsText.push({
+                value: key,
+                title: defaultSelect[key]
+              });
+            }
           }
         });
       }
@@ -235853,10 +235903,10 @@ var TabPane = __webpack_require__(49416);
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=4f45a086&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=68c8ec40&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=4f45a086&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=68c8ec40&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -235869,8 +235919,8 @@ var TabPane = __webpack_require__(49416);
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_4f45a086_render,
-  ToolBarvue_type_template_id_4f45a086_staticRenderFns,
+  ToolBarvue_type_template_id_68c8ec40_render,
+  ToolBarvue_type_template_id_68c8ec40_staticRenderFns,
   false,
   null,
   null,

package/lib/hoeditor.umd.js

@@ -59405,7 +59405,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
         var lHeight = tempComment.lineHeight;
         for (var i = 1; i < topComments.length; i++) {
           var stageY = getStagePos(topComments[i])[1];
-          if (stageY > maxValue) {
+          if (stageY >= maxValue) {
             maxValue = stageY;
             lHeight = topComments[i].lineHeight;
             tempComment = topComments[i];
@@ -211279,7 +211279,7 @@ var SignNode = __webpack_require__(47241);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/ParagraphNode.ts
 var ParagraphNode = __webpack_require__(3021);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('2.0.119');
+/* harmony default export */ var version = ('2.0.121');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(68240);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -223722,6 +223722,40 @@ var VueController = /*#__PURE__*/function () {
       var xml = XmlBeauty_xmlBeauty(xmlRoot);
       return xml; //xmlBeauty(xmlRoot);
     }
+    /**
+     * 更新护理记录
+     * @param table 表格节点
+     * @param operType 操作类型 "add"新增 "update"修改
+     * @param rowIndex 行索引 新增时传-1 修改传对应的行索引
+     * @param data json数据
+     */
+  }, {
+    key: "updateNurseRecord",
+    value: function updateNurseRecord(table, operType, rowIndex, data) {
+      var _this6 = this;
+      var keys = Object.keys(data);
+      var backfill = function backfill(r) {
+        for (var i = 0; i < keys.length; i++) {
+          var cell = table.rows[r][i];
+          if (cell) {
+            var text = data[keys[i]];
+            cell.childNodes.splice(1, cell.childNodes.length);
+            var textNode = new TextNode/* TextNode */.R(_this6._hoEditorFactoryID, table.rootNodes, cell, BaseNode/* NodeType.ntText */.Jq.ntText, text, cell.childNodes[0].styleIndex);
+            cell.drawCell.needUpdate = true;
+            cell.childNodes.push(textNode);
+          }
+        }
+      };
+      if (operType == "add") {
+        table.insertRows(table.rowCount - 1, 1, table.rowCount - 1);
+        backfill(table.rowCount - 1);
+      }
+      if (operType == "update") {
+        if (rowIndex < 0) return;
+        backfill(rowIndex);
+      }
+      table.update();
+    }
   }]);
   return VueController;
 }();
@@ -227062,7 +227096,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,defineProperty/* default */.Z)(this, "_superiorSigns", []);
     (0,defineProperty/* default */.Z)(this, "_notAllowCrossPatiPaste", false);
     (0,defineProperty/* default */.Z)(this, "_fontSizeMap", new Map());
-    (0,defineProperty/* default */.Z)(this, "_notAllowEditInReview", false);
+    (0,defineProperty/* default */.Z)(this, "_notAllowEditInReview", true);
     this._hoEditorFactoryId = id;
   }
   (0,createClass/* default */.Z)(HOEditorFactory, [{
@@ -229378,8 +229412,8 @@ var HoDocs_component = (0,componentNormalizer/* default */.Z)(
 )
 
 /* harmony default export */ var HoDocs = (HoDocs_component.exports);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-86.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/toolbar/ToolBar.vue?vue&type=template&id=4f45a086&
-var ToolBarvue_type_template_id_4f45a086_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-86.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/toolbar/ToolBar.vue?vue&type=template&id=68c8ec40&
+var ToolBarvue_type_template_id_68c8ec40_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -229582,8 +229616,10 @@ var ToolBarvue_type_template_id_4f45a086_render = function render() {
     });
   }), 1)], 1)], 1);
 };
-var ToolBarvue_type_template_id_4f45a086_staticRenderFns = [];
+var ToolBarvue_type_template_id_68c8ec40_staticRenderFns = [];
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
+var es_array_map = __webpack_require__(21249);
 ;// CONCATENATED MODULE: ./src/components/toolbar/insert/HoMedicalExpression.tsx
 
 /* harmony default export */ var HoMedicalExpression = (external_commonjs_vue_commonjs2_vue_root_Vue_default().extend({
@@ -230115,8 +230151,6 @@ var ToolBarvue_type_template_id_4f45a086_staticRenderFns = [];
     })])])])])])]);
   }
 }));
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
-var es_array_map = __webpack_require__(21249);
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolFamily.tsx
 
 
@@ -235242,6 +235276,8 @@ var TabPane = __webpack_require__(95296);
 
 
 
+
+
 /* harmony default export */ var ToolBarvue_type_script_lang_js_ = ({
   name: 'ToolBar',
   components: {
@@ -235561,12 +235597,12 @@ var TabPane = __webpack_require__(95296);
         }
       }
     },
-    // toolbarParams: {
-    //     deep: true,
-    //     handler() {
-    //         this.handleToolbarParams();
-    //     },
-    // },
+    toolbarParams: {
+      deep: true,
+      handler: function handler() {
+        this.handleToolbarParams(true);
+      }
+    },
     // vueController: {
     //     deep: true,
     //     handler() {
@@ -235632,8 +235668,8 @@ var TabPane = __webpack_require__(95296);
       if (!this.defaultEditJson.isInsertTable) delete defaultSelect['ho-table'];
       if (!this.defaultReviewJson.isReview) delete defaultSelect['ho-review'];
       if (this.toolbarParams) {
-        this.defaultToolBarParamsText = [];
-        if (this.$slots.beforeBrowse[0]) {
+        // this.defaultToolBarParamsText = [];
+        if (this.$slots.beforeBrowse && this.$slots.beforeBrowse[0]) {
           var label = this.$slots.beforeBrowse[0].componentOptions.propsData.label;
           var name = this.$slots.beforeBrowse[0].componentOptions.propsData.name;
           this.defaultToolBarParamsText.unshift({
@@ -235644,10 +235680,24 @@ var TabPane = __webpack_require__(95296);
         this.defaultToolBarParams = (0,objectSpread2/* default */.Z)((0,objectSpread2/* default */.Z)({}, this.defaultToolBarParams), this.toolbarParams);
         Object.keys(this.defaultToolBarParams).forEach(function (key) {
           if (defaultSelect[key]) {
-            _this2.defaultToolBarParamsText.push({
-              value: key,
-              title: defaultSelect[key]
-            });
+            if (_this2.defaultToolBarParamsText.filter(function (v) {
+              return v.value === key;
+            }).length > 0) {
+              _this2.defaultToolBarParamsText = _this2.defaultToolBarParamsText.map(function (v, index) {
+                if (index > 0 && defaultSelect[v.value] === undefined) {
+                  return undefined;
+                } else {
+                  return v;
+                }
+              }).filter(function (m) {
+                return m;
+              });
+            } else {
+              _this2.defaultToolBarParamsText.push({
+                value: key,
+                title: defaultSelect[key]
+              });
+            }
           }
         });
       }
@@ -235863,10 +235913,10 @@ var TabPane = __webpack_require__(95296);
 });
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=script&lang=js&
  /* harmony default export */ var toolbar_ToolBarvue_type_script_lang_js_ = (ToolBarvue_type_script_lang_js_); 
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-68.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-68.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-68.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-68.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=4f45a086&prod&lang=scss&
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-68.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-68.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-68.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-68.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=68c8ec40&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=4f45a086&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue?vue&type=style&index=0&id=68c8ec40&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/toolbar/ToolBar.vue
 
@@ -235879,8 +235929,8 @@ var TabPane = __webpack_require__(95296);
 
 var ToolBar_component = (0,componentNormalizer/* default */.Z)(
   toolbar_ToolBarvue_type_script_lang_js_,
-  ToolBarvue_type_template_id_4f45a086_render,
-  ToolBarvue_type_template_id_4f45a086_staticRenderFns,
+  ToolBarvue_type_template_id_68c8ec40_render,
+  ToolBarvue_type_template_id_68c8ec40_staticRenderFns,
   false,
   null,
   null,