hoeditor-web 3.0.39 → 3.0.41

package/lib/hoeditor.umd.js

@@ -8877,7 +8877,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 93648:
+/***/ 16512:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -8897,7 +8897,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=6852d403&
+;// 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=4e689c5a&
 
 
 
@@ -9176,14 +9176,19 @@ var render = function render() {
   }, [_c('template', {
     slot: "renderExtraFooter"
   }, [_vm.dateTimeStyle.includes('mm') ? _c('a-time-picker', {
+    ref: "timePicker",
     staticStyle: {
       "width": "100%"
     },
     attrs: {
       "type": "time",
+      "size": "small",
       "format": _vm.dateTimeStyle.split(' ')[1],
-      "valueFormat": _vm.dateTimeStyle.split(' ')[1],
-      "size": "small"
+      "valueFormat": _vm.dateTimeStyle.split(' ')[1]
+    },
+    on: {
+      "focus": _vm.timeFocus,
+      "blur": _vm.timeBlur
     },
     model: {
       value: _vm.time,
@@ -9225,6 +9230,7 @@ var render = function render() {
   }, [_vm._v("确定")])], 1)], 1)], 2) : _c('div', {
     staticClass: "timepicker"
   }, [_c('a-time-picker', {
+    ref: "timePicker",
     style: {
       marginLeft: '2px',
       width: '30px'
@@ -9279,7 +9285,7 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=6852d403&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=4e689c5a&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
@@ -11355,7 +11361,8 @@ var type = __webpack_require__(41542);
       enterIndex: 0,
       // 保存打开表单时的节点路径
       endPath: '',
-      calendarInstance: null
+      calendarInstance: null,
+      calendarTimeInstance: null
     };
   },
   computed: {
@@ -11476,12 +11483,14 @@ var type = __webpack_require__(41542);
         }
       }, 100);
     }
-    if (this.dateTimeStyle.includes('yyyy') || this.dateTimeStyle.includes('MM') || this.dateTimeStyle.includes('dd')) {
+    if (this.dateTimeStyle.replace(/yyyy|YYYY|MM|DD|dd/g, '').length !== this.dateTimeStyle.length) {
       this.$nextTick(function () {
         if (_this2.$refs.datePicker) {
           _this2.calendarInstance = _this2.$refs.datePicker.$refs.picker.$refs.calendarInstance.$el.querySelector('.ant-calendar-input');
-          _this2.calendarInstance.addEventListener('input', _this2.calendarInstanceChange);
-          _this2.calendarInstance.addEventListener('keydown', _this2.calendarInstanceKeydown);
+          if (_this2.calendarInstance) {
+            _this2.calendarInstance.addEventListener('input', _this2.calendarInstanceChange);
+            _this2.calendarInstance.addEventListener('keydown', _this2.calendarInstanceKeydown);
+          }
         }
       });
     }
@@ -11490,15 +11499,84 @@ var type = __webpack_require__(41542);
     // datePickerChange(event) {
     //     console.log('datePickerChange ==> ', event.target.value);
     // },
-    calendarInstanceKeydown: function calendarInstanceKeydown(event) {
+    timeFocus: function timeFocus(event) {
+      if (this.calendarTimeInstance) {
+        this.calendarTimeInstance.removeEventListener('input', this.calendarTimeInstance);
+        this.calendarTimeInstance.removeEventListener('keydown', this.calendarTimeInstance);
+        this.calendarTimeInstance = null;
+      }
+    },
+    timeBlur: function timeBlur(event) {
+      if (this.calendarTimeInstance == null) {
+        this.timeBindEvent();
+      }
+    },
+    timeBindEvent: function timeBindEvent() {
       var _this3 = this;
+      if (this.dateTimeStyle.replace(/hh|HH|mm|ss/g, '').length !== this.dateTimeStyle.length) {
+        this.$nextTick(function () {
+          if (_this3.$refs.timePicker && _this3.$refs.timePicker.$refs.timePicker && _this3.$refs.timePicker.$refs.timePicker.$refs.panel) {
+            _this3.calendarTimeInstance = _this3.$refs.timePicker.$refs.timePicker.$refs.panel.$el.querySelector(".ant-time-picker-panel-input ");
+            if (_this3.calendarTimeInstance) {
+              _this3.calendarTimeInstance.addEventListener('input', _this3.calendarTimeInstanceChange);
+              _this3.calendarTimeInstance.addEventListener('keydown', _this3.calendarTimeInstanceKeydown);
+            }
+          }
+        });
+      }
+    },
+    calendarTimeInstanceChange: function calendarTimeInstanceChange(event) {
+      var style = this.dateTimeStyle.replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
+      var timeFormat = this.dateTimeStyle.includes(' ') ? this.dateTimeStyle.split(' ')[1] : this.dateTimeStyle;
+      var format = this.dateTimeStyle.replace(/[^a-zA-Z]/g, '').replace(/dd/g, 'DD').replace(/yyyy/g, 'YYYY');
+      var timeStyle = format.replace(/yyyy|YYYY|MM|DD/g, '');
+      var defaultValue = event.target.value;
+      if (event.target.value.replace(/[^0-9]/g, '').length !== defaultValue.length) {
+        console.warn("value: ".concat(defaultValue));
+        return;
+      }
+      if (timeStyle) {
+        if (defaultValue.length >= timeStyle.length) {
+          var value = moment_default()(String(defaultValue), timeStyle).format(timeFormat);
+          if (value != 'Invalid date') {
+            if (this.dateTimeStyle.includes(' ')) {
+              this.time = value;
+            } else {
+              this.date = value;
+            }
+          }
+        }
+      }
+    },
+    calendarTimeInstanceKeydown: function calendarTimeInstanceKeydown(event) {
+      var _this4 = this;
+      if (event && event.keyCode == 13) {
+        this.$nextTick(function () {
+          if (_this4.calendarInstance) {
+            _this4.calendarInstance.removeEventListener('input', _this4.calendarInstanceChange);
+            _this4.calendarInstance.removeEventListener('keydown', _this4.calendarInstanceKeydown);
+          }
+          if (_this4.calendarTimeInstance) {
+            _this4.calendarTimeInstance.removeEventListener('input', _this4.calendarTimeInstanceChange);
+            _this4.calendarTimeInstance.removeEventListener('keydown', _this4.calendarTimeInstanceKeydown);
+          }
+          _this4.sureDate();
+        });
+      }
+    },
+    calendarInstanceKeydown: function calendarInstanceKeydown(event) {
+      var _this5 = this;
       if (event && event.keyCode == 13) {
         this.$nextTick(function () {
-          if (_this3.calendarInstance) {
-            _this3.calendarInstance.removeEventListener('input', _this3.calendarInstanceChange);
-            _this3.calendarInstance.removeEventListener('input', _this3.calendarInstanceChange);
+          if (_this5.calendarInstance) {
+            _this5.calendarInstance.removeEventListener('input', _this5.calendarInstanceChange);
+            _this5.calendarInstance.removeEventListener('keydown', _this5.calendarInstanceKeydown);
+          }
+          if (_this5.calendarTimeInstance) {
+            _this5.calendarTimeInstance.removeEventListener('input', _this5.calendarTimeInstanceChange);
+            _this5.calendarTimeInstance.removeEventListener('keydown', _this5.calendarTimeInstanceKeydown);
           }
-          _this3.sureDate();
+          _this5.sureDate();
         });
       }
     },
@@ -11514,15 +11592,15 @@ var type = __webpack_require__(41542);
       }
       if (dateStyle && timeStyle) {
         if (defaultValue.length >= dateStyle.length && defaultValue.length < format.length) {
-          var value = moment_default()(String(defaultValue), dateStyle).format(style.split(" ")[0]);
+          var value = moment_default()(String(defaultValue), dateStyle).format(style.split(' ')[0]);
           if (value != 'Invalid date') {
             this.date = value;
           }
         } else if (defaultValue.length >= format.length) {
           var _value = moment_default()(String(defaultValue), format).format(style);
           if (_value != 'Invalid date') {
-            this.date = _value.split(" ")[0];
-            this.time = _value.split(" ")[1];
+            this.date = _value.split(' ')[0];
+            this.time = _value.split(' ')[1];
           }
         }
       } else if (dateStyle && !timeStyle) {
@@ -11591,7 +11669,7 @@ var type = __webpack_require__(41542);
       this.sureDate();
     },
     currentDateTime: function currentDateTime() {
-      var _this4 = this;
+      var _this6 = this;
       var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this.hoEditorId);
       var node = this.getCurrentPoperNode();
       var date = this.dateFormat(new Date(), node.controlStyle);
@@ -11613,7 +11691,7 @@ var type = __webpack_require__(41542);
       };
       hoEditorFactory.vueController.updateDateTime(JSON.stringify(params));
       this.$nextTick(function () {
-        return _this4.handleClose();
+        return _this6.handleClose();
       });
     },
     sureDate: function sureDate() {
@@ -11693,12 +11771,12 @@ var type = __webpack_require__(41542);
      * 互斥列表选择
      */
     mutexSelectItemsChange: function mutexSelectItemsChange(value) {
-      var _this5 = this;
+      var _this7 = this;
       if (value.length > 0) {
         this.poperSelectList.forEach(function (v) {
           if (value.includes(v.id)) {
             v.selected = true;
-            _this5.mutexType = String(v.type);
+            _this7.mutexType = String(v.type);
           } else {
             v.selected = false;
           }
@@ -11707,7 +11785,7 @@ var type = __webpack_require__(41542);
       } else if (value.length === 0) {
         this.poperSelectList.forEach(function (v) {
           v.selected = false;
-          _this5.mutexType = '';
+          _this7.mutexType = '';
         });
         this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
       }
@@ -11716,7 +11794,7 @@ var type = __webpack_require__(41542);
      * 选择
      */
     selectItemsChange: function selectItemsChange(value) {
-      var _this6 = this;
+      var _this8 = this;
       if (!this.isAllowMultiSelect) {
         var item = {};
         var selectItemIndex = 0;
@@ -11738,12 +11816,12 @@ var type = __webpack_require__(41542);
         this.poperSelectList.map(function (v) {
           if (value.target.id == v.id) {
             v.selected = value.target.checked;
-            if (v.selected && _this6.selectedList.filter(function (m) {
+            if (v.selected && _this8.selectedList.filter(function (m) {
               return m.id == v.id;
             }).length == 0) {
-              _this6.selectedList.push(v);
+              _this8.selectedList.push(v);
             } else {
-              _this6.selectedList = _this6.selectedList.filter(function (m) {
+              _this8.selectedList = _this8.selectedList.filter(function (m) {
                 return m.id != v.id;
               });
             }
@@ -11761,7 +11839,7 @@ var type = __webpack_require__(41542);
       }
     },
     selectItems: function selectItems(item, index) {
-      var _this7 = this;
+      var _this9 = this;
       if (!this.isAllowMultiSelect) {
         this.poperSelectList.forEach(function (v) {
           v.selected = false;
@@ -11776,13 +11854,13 @@ var type = __webpack_require__(41542);
             v.selected = !v.selected;
           }
           if (v.selected) {
-            if (_this7.isCanSearch && _this7.selectedList.filter(function (m) {
+            if (_this9.isCanSearch && _this9.selectedList.filter(function (m) {
               return m.id == v.id;
             }).length == 0) {
-              _this7.selectedList.push(v);
+              _this9.selectedList.push(v);
             }
           } else {
-            if (_this7.isCanSearch) _this7.selectedList = _this7.selectedList.filter(function (m) {
+            if (_this9.isCanSearch) _this9.selectedList = _this9.selectedList.filter(function (m) {
               return m.id != v.id;
             });
           }
@@ -11793,12 +11871,12 @@ var type = __webpack_require__(41542);
     },
     // 全选
     allSelect: function allSelect() {
-      var _this8 = this;
+      var _this10 = this;
       this.selectedList = [];
       this.poperSelectList.forEach(function (v) {
         v.selected = true;
-        _this8.selectedList.push(v);
-        _this8.selectedIds.push(v.id);
+        _this10.selectedList.push(v);
+        _this10.selectedIds.push(v.id);
       });
       this.currentList = (0,toConsumableArray/* default */.Z)(this.poperSelectList);
     },
@@ -11819,7 +11897,7 @@ var type = __webpack_require__(41542);
     },
     // 选中
     sureSelect: function sureSelect() {
-      var _this9 = this;
+      var _this11 = this;
       console.time('下拉选中时间');
       var text = '';
       var keyValue = '';
@@ -11847,7 +11925,7 @@ var type = __webpack_require__(41542);
               text += v.text + ',';
               textArr.push(v.text);
             }
-            if (_this9.isAllowMultiSelect && _this9.isMultiLinesDisplay && !_this9.mutexSelect) {
+            if (_this11.isAllowMultiSelect && _this11.isMultiLinesDisplay && !_this11.mutexSelect) {
               text += '\n';
             }
             keyValue += v.id + ',';
@@ -11889,7 +11967,7 @@ var type = __webpack_require__(41542);
       } else if (currentPoperNode instanceof TextInputFieldNode/* TextInputFieldNode */.re) {
         text = text.replace(/,/g, currentPoperNode.downListProperty.splitCharacter);
         Object.keys(this.textParam).map(function (v) {
-          _this9.textParam[v] = currentPoperNode[v];
+          _this11.textParam[v] = currentPoperNode[v];
         });
         this.textParam.text = text;
         this.textParam.keyValue = keyValue;
@@ -11911,7 +11989,7 @@ var type = __webpack_require__(41542);
       // 元素联动内容延时关闭下拉选项，防止双击把光标移动到联动元素外
       if (selected.length === 1 && selected[0].text.indexOf('<元素>') !== -1) {
         setTimeout(function () {
-          _this9.handleClose();
+          _this11.handleClose();
         }, 200);
       } else {
         this.handleClose();
@@ -11957,10 +12035,10 @@ var type = __webpack_require__(41542);
 });
 ;// 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-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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6852d403&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/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=4e689c5a&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=6852d403&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=4e689c5a&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -18562,7 +18640,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 2064:
+/***/ 79032:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -18574,7 +18652,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": function() { return /* binding */ table_TableFormula; }
 });
 
-;// 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/table/TableFormula.vue?vue&type=template&id=58b786b2&
+;// 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/table/TableFormula.vue?vue&type=template&id=0f994c3d&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -18882,6 +18960,9 @@ var render = function render() {
   }, [_c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', [_vm._v("行数")]), _c('a-input-number', {
+    staticStyle: {
+      "width": "90%"
+    },
     attrs: {
       "precision": 0,
       "min": 1,
@@ -18898,6 +18979,9 @@ var render = function render() {
   })], 1), _c('div', {
     staticClass: "ho-table-features-list"
   }, [_c('p', [_vm._v("列数")]), _c('a-input-number', {
+    staticStyle: {
+      "width": "90%"
+    },
     attrs: {
       "precision": 0,
       "min": 1,
@@ -18911,6 +18995,44 @@ var render = function render() {
       },
       expression: "form.columns"
     }
+  })], 1)]) : _vm._e(), _vm.formula === 'ftCalcDays' ? _c('section', {
+    staticClass: "costum-row-columns"
+  }, [_c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "160px",
+      "padding": "0"
+    }
+  }, [_vm._v("开始时间单元格编号")]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.startDateCode,
+      callback: function callback($$v) {
+        _vm.startDateCode = $$v;
+      },
+      expression: "startDateCode"
+    }
+  })], 1), _c('div', {
+    staticClass: "ho-table-features-list"
+  }, [_c('p', {
+    staticStyle: {
+      "width": "160px",
+      "padding": "0"
+    }
+  }, [_vm._v("结束时间单元格编号")]), _c('a-input', {
+    attrs: {
+      "autocomplete": "off"
+    },
+    model: {
+      value: _vm.endDateCode,
+      callback: function callback($$v) {
+        _vm.endDateCode = $$v;
+      },
+      expression: "endDateCode"
+    }
   })], 1)]) : _vm._e()]), _c('footer', {
     staticClass: "ho-modal-footer"
   }, [_c('a-button', {
@@ -19028,7 +19150,9 @@ var TableFormula = __webpack_require__(90832);
         ftScoreMapping: '通过多个分值组合计算，转换为对应的值域信息。例如：1-5分(高)，6-10分中，10-15分(低)',
         labor: ['将时间元素设置成运算模式，比如这个第一产程时间=宫口全开时间-宫缩开始时间', '第1产程是从规律 “宫缩开始”到“宫口开全”，（“宫口开全” -  “宫缩开始”）', '第2产程是从 “宫口开全” 到 “胎儿娩出”， (“胎儿娩出” -  “宫口开全” )', '第3产程是从 “胎儿娩出” 到 “胎盘娩出” ， (“胎盘娩出” - “胎儿娩出”  )', '总产程:= 第1产程+第2产程+第3产程', '表示格式 示例:  9小时24分24秒，当时间大于24小时时, 显示格式为“28小时30分30秒”']
       },
-      bodySurfaceAreaWeight: ''
+      bodySurfaceAreaWeight: '',
+      startDateCode: '',
+      endDateCode: ''
     };
   },
   inject: ['hoEditorProvider'],
@@ -19091,6 +19215,11 @@ var TableFormula = __webpack_require__(90832);
                 console.warn("\u5206\u503C\u6620\u5C04\u516C\u5F0F\u89E3\u6790\u5931\u8D25\uFF1A".concat(node.formulaStr));
               }
             }
+          } else if (this.formula === 'ftCalcDays') {
+            if (node.formulaStr) {
+              this.startDateCode = node.formulaStr.split(',')[0];
+              this.endDateCode = node.formulaStr.split(',')[1];
+            }
           }
         }
       }
@@ -19145,6 +19274,8 @@ var TableFormula = __webpack_require__(90832);
         this.vueController.insertTable(this.form.rows, this.form.columns);
       } else if (this.formula === 'bodySurfaceArea') {
         this.vueController.insertTableFormula("".concat(this.bodySurfaceAreaWeight).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea);
+      } else if (this.formula === 'ftCalcDays') {
+        this.vueController.insertTableFormula("".concat(this.startDateCode, ",").concat(this.endDateCode).toLocaleLowerCase(), this.isHideZero, TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays);
       }
       this.handleClose();
     },
@@ -19166,10 +19297,10 @@ var TableFormula = __webpack_require__(90832);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableFormulavue_type_script_lang_js_ = (TableFormulavue_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/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&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/controls/table/TableFormula.vue?vue&type=style&index=0&id=0f994c3d&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=58b786b2&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableFormula.vue?vue&type=style&index=0&id=0f994c3d&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -58699,6 +58830,10 @@ var SignNode = /*#__PURE__*/function (_BaseNode) {
       var imgHeight = isClearSign ? 0 : Number(json.imgHeight);
       var isTemplate = json.isTemplate === true || json.isTemplate === "true" ? true : false;
       var attribute = json.attribute ? Number(json.attribute) : 0;
+      // 处理otherProperties参数传错导致fingerPrintSrc属性错误问题
+      if ((0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_typeof_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(json.fingerPrintSrc) == 'object') {
+        json.fingerPrintSrc = '';
+      }
       var signNode = new SignNode(hoEditorFactoryID, rootNodes, pNode ? pNode : null, _BaseNode__WEBPACK_IMPORTED_MODULE_15__/* .NodeType.ntSign */ .Jq.ntSign, number, type, json.name, json.signType ? Number(json.signType) : 0, json.signFormat ? json.signFormat : "签名医师", isClearSign ? "" : json.signor, isClearSign ? "" : json.signTime, json.signTimeFormat ? json.signTimeFormat : "yyyy-MM-dd HH:mm", isClearSign ? "" : json.imgSrc, imgWidth, imgHeight, isClearSign ? undefined : json.customProperty, isTemplate, json.styleIndex ? Number(json.styleIndex) : undefined, json.connectMode, json.isFront, json.allowEditSignTime, isClearSign ? "" : json.fingerPrintSrc, isClearSign ? 0 : json.fingerPosition, attribute, json.connectChar, json.otherProperties);
       signNode.PNGToJPG = json.PNGToJPG == 1 ? 1 : 0;
       // if (json.id != "") {
@@ -59019,6 +59154,7 @@ var FormularType;
   FormularType[FormularType["ftPregnantWeeks"] = 5] = "ftPregnantWeeks";
   FormularType[FormularType["ftScoreMapping"] = 6] = "ftScoreMapping";
   FormularType[FormularType["ftBodySurfaceArea"] = 7] = "ftBodySurfaceArea";
+  FormularType[FormularType["ftCalcDays"] = 8] = "ftCalcDays";
 })(FormularType || (FormularType = {}));
 var TableFormula = /*#__PURE__*/function (_ControlNode) {
   (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_inherits_js__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(TableFormula, _ControlNode);
@@ -59126,6 +59262,9 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         if (this.formularType === FormularType.ftBodySurfaceArea) {
           this.clacBodySurfaceArea();
         }
+        if (this.formularType === FormularType.ftCalcDays) {
+          this.clacDays();
+        }
       }
     }
   }, {
@@ -59871,6 +60010,46 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
       }
       return strRet;
     }
+  }, {
+    key: "clacDays",
+    value: function clacDays() {
+      var strRet = " ";
+      var table = this.getParentCell().table;
+      var arrStr = this.formulaStr.split(",");
+      if (arrStr.length < 2) {
+        ant_design_vue_es_message__WEBPACK_IMPORTED_MODULE_38__/* ["default"].warn */ .Z.warn("入院时间和出院时间对应的单元格编号传入有误:" + this.formulaStr);
+      }
+      var _this$getRowColByCell25 = this.getRowColByCellAdress(arrStr[0]),
+        _this$getRowColByCell26 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell25, 2),
+        rysjRow = _this$getRowColByCell26[0],
+        rysjCol = _this$getRowColByCell26[1];
+      var _this$getRowColByCell27 = this.getRowColByCellAdress(arrStr[1]),
+        _this$getRowColByCell28 = (0,D_project_go_test_createJS_hoeditor_web_node_modules_babel_runtime_helpers_esm_slicedToArray_js__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(_this$getRowColByCell27, 2),
+        cysjRow = _this$getRowColByCell28[0],
+        cysjCol = _this$getRowColByCell28[1];
+      if (rysjRow >= 0 && rysjCol >= 0 && cysjRow >= 0 && cysjCol >= 0) {
+        if (!table.rows[rysjRow]) return strRet;
+        if (!table.rows[cysjRow]) return strRet;
+        var rCell = table.rows[rysjRow][rysjCol];
+        var cCell = table.rows[cysjRow][cysjCol];
+        if (rCell && cCell) {
+          var rysj = rCell.getCellText();
+          var cysj = cCell.getCellText();
+          if (!rysj || !cysj) return strRet;
+          if ((0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(rysj) && (0,_plugins_util__WEBPACK_IMPORTED_MODULE_30__/* .isDate */ .J_)(cysj)) {
+            var rDate = new Date(rysj);
+            var cDate = new Date(cysj);
+            var rTime = rDate.getTime();
+            var cTime = cDate.getTime();
+            var subTime = ((cTime - rTime + 1) / (1000 * 3600 * 24)).toString();
+            var dayData = subTime.split('.');
+            var day = dayData[0] + "天";
+            return day;
+          }
+        }
+      }
+      return strRet;
+    }
   }, {
     key: "isCellInFormula",
     value: function isCellInFormula(acell, r, c) {
@@ -59942,6 +60121,8 @@ var TableFormula = /*#__PURE__*/function (_ControlNode) {
         this._text = this.getScoreMapping();
       } else if (this.formularType === FormularType.ftBodySurfaceArea) {
         this._text = this.clacBodySurfaceArea();
+      } else if (this.formularType === FormularType.ftCalcDays) {
+        this._text = this.clacDays();
       }
       this.node2DrawNode();
     }
@@ -68443,6 +68624,7 @@ var DrawArea = /*#__PURE__*/function (_DrawRect) {
               this._endDline = -2;
             }
             isFull = true;
+            this._docHeight -= aTop;
             // this.clearOverDitem(dlines, nextDline);
             return [isFull, dTop, restHeight];
           } else {
@@ -70504,10 +70686,11 @@ var DrawCell = /*#__PURE__*/function (_DrawRect) {
       var valignTop = 0;
       if (startDline === 0) {
         var aHeight = this._cell.drawCell.calcCellHeight();
+        var cellMaxHeigth = Math.min(maxHeight, aHeight);
         if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vatop */ .TR.vatop) {
           valignTop = 0;
-        } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vacenter */ .TR.vacenter && aHeight > this._cell.drawCell.docHeight) {
-          valignTop = (aHeight - this._cell.drawCell.docHeight) / 2;
+        } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vacenter */ .TR.vacenter && cellMaxHeigth > this._cell.drawCell.docHeight) {
+          valignTop = (cellMaxHeigth - this._cell.drawCell.docHeight) / 2;
         } else if (this._cell.cellProperty.align === _editor_dom_TableProperty__WEBPACK_IMPORTED_MODULE_13__/* .VAlign.vabottom */ .TR.vabottom && aHeight > this._cell.drawCell.docHeight) {
           valignTop = aHeight - this._cell.drawCell.docHeight;
         }
@@ -83964,7 +84147,7 @@ var DrawTree = /*#__PURE__*/function () {
           value.parentNode.update();
         }
         var isCellInFormula = value.isCellInFormula(cell, r, c);
-        if (isCellInFormula || 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.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea) {
+        if (isCellInFormula || 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.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
           //const str = value.formulaStr;
           value.updateResult();
           value.getParentCell().drawCell.needUpdate = true;
@@ -195577,7 +195760,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 93648,
+	"./poperSelect/PoperSelect.vue": 16512,
 	"./poperTipText/PoperTipText.vue": 15845,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -195591,7 +195774,7 @@ var map = {
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
 	"./table/TableFormTree.vue": 39703,
-	"./table/TableFormula.vue": 2064,
+	"./table/TableFormula.vue": 79032,
 	"./table/TableProperty.vue": 47130,
 	"./table/TableRowProperty.vue": 5218,
 	"./textDialog/TextDialog.vue": 94535,
@@ -231712,7 +231895,7 @@ Input.install = function (Vue) {
 
 
 /* harmony default export */ var antd = ([es_button, input, input_number, es_checkbox, date_picker, time_picker, es_radio, es_select, es_tabs, es_dropdown, es_menu, es_upload, tooltip, table, popover, es_icon/* default */.Z, config_provider]);
-;// 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/HoDocs.vue?vue&type=template&id=7a9c6e06&
+;// 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/HoDocs.vue?vue&type=template&id=1ebd4c64&
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
@@ -231830,8 +232013,8 @@ var es_string_match = __webpack_require__(4723);
 var es_number_constructor = __webpack_require__(9653);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__(38862);
-;// 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/HoDoc.vue?vue&type=template&id=1e74a76d&
-var HoDocvue_type_template_id_1e74a76d_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/HoDoc.vue?vue&type=template&id=41bb5f98&
+var HoDocvue_type_template_id_41bb5f98_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -231861,7 +232044,6 @@ var HoDocvue_type_template_id_1e74a76d_render = function render() {
         "currentActivePages": _vm.activePageIndex.index,
         "hoEditorId": _vm.hoEditorId,
         "hoEditorFactoryIdList": _vm.hoEditorFactoryIdList,
-        "mouseMoveNodes": _vm.mouseMoveNodes,
         "viewableAreaObserver": _vm.viewableAreaObserver,
         "inViewPages": _vm.inViewPages,
         "canvasHeadFootPos": _vm.canvasHeadFootPos,
@@ -231977,7 +232159,7 @@ var HoDocvue_type_template_id_1e74a76d_render = function render() {
     }
   }, [_vm._v("v " + _vm._s(_vm.version))])])])], 1);
 };
-var HoDocvue_type_template_id_1e74a76d_staticRenderFns = [];
+var HoDocvue_type_template_id_41bb5f98_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.filter.js
 var es_array_filter = __webpack_require__(57327);
@@ -232497,10 +232679,16 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       if (!dPage.drawDomLevel) {
         return false;
       }
+      if (!hoeditorfactory.canvasListNode) {
+        hoeditorfactory.canvasListNode = document.querySelector(".ho-editor-list");
+      }
+      hoeditorfactory.moveY = aevent.stageY + this._pageIndex * hoeditorfactory.pageProperty.heightPixes;
       if (aevent.currentTarget === this.stage) {
         var _hoeditorfactory$draw;
-        hoeditorfactory.drawTree.selectRange.clearAllSelectShape();
-        hoeditorfactory.drawTree.selectRange.beginRangeSelect = true;
+        if (aevent.nativeEvent.button === 0) {
+          hoeditorfactory.drawTree.selectRange.clearAllSelectShape();
+          hoeditorfactory.drawTree.selectRange.beginRangeSelect = true;
+        }
         if ((_hoeditorfactory$draw = hoeditorfactory.drawTree.activePage) !== null && _hoeditorfactory$draw !== void 0 && _hoeditorfactory$draw.activeDrawRect.rootPath.startsWith(DocTree/* gMainPath */.d9)) {
           hoeditorfactory.drawTree.activePage = dPage;
         }
@@ -232510,58 +232698,48 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         this._oldRange = hoeditorfactory.docTree.curDomRange.clone();
         var startPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (startPos) {
-          // if (hoeditorfactory.structureConvert._signNodes.length > 0) {
-          // }
-
-          var curOnDragNode = hoeditorfactory.docTree.curOnDragNode;
-          if (curOnDragNode) {
-            var nodePath = curOnDragNode.getNodePath();
-            // drawNode.children.forEach((value, index) => {
-            //   if (value.name !== curOnDragNode.id) {
-            //     value.alpha = 0;
-            //   }
-            // });
-            if (nodePath !== startPos.path) {
-              var drawNode = curOnDragNode.drawNodes[0];
-              for (var d = drawNode.children.length - 1; d >= 0; d--) {
-                if (drawNode.children[d].name !== curOnDragNode.id) {
-                  drawNode.children.splice(d, 1);
+          if (aevent.nativeEvent.button === 0) {
+            var curOnDragNode = hoeditorfactory.docTree.curOnDragNode;
+            if (curOnDragNode) {
+              var nodePath = curOnDragNode.getNodePath();
+              if (nodePath !== startPos.path) {
+                var drawNode = curOnDragNode.drawNodes[0];
+                for (var d = drawNode.children.length - 1; d >= 0; d--) {
+                  if (drawNode.children[d].name !== curOnDragNode.id) {
+                    drawNode.children.splice(d, 1);
+                  }
                 }
+                hoeditorfactory.docTree.curOnDragNode = null;
+                HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
               }
-              hoeditorfactory.docTree.curOnDragNode = null;
-              HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
             }
-            //if (drawLine instanceof DrawLine) drawLine.updateCache();
-            //drawNode.stage.update();
-          }
-
-          var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
-          if (curComment) {
-            var endDrawNode = curComment.eNode.drawNodes[0];
-            var drawArea = hoeditorfactory.drawPageTree.getMainRootArea(endDrawNode);
-            if (!drawArea) return false;
-            for (var i = 0; i < drawArea.children.length; i++) {
-              var child = drawArea.children[i];
-              if (child instanceof createjs.Shape && curComment.id === child.name) {
-                child.alpha = 0.5;
-              }
-              if (child instanceof createjs.Container && curComment.id === child.name) {
-                child.children.forEach(function (value) {
-                  if (value.name === 'back') {
-                    value.alpha = 0.5;
-                  }
-                });
+            var curComment = hoeditorfactory.drawTree.curOnSelectedComment;
+            if (curComment) {
+              var endDrawNode = curComment.eNode.drawNodes[0];
+              var drawArea = hoeditorfactory.drawPageTree.getMainRootArea(endDrawNode);
+              if (!drawArea) return false;
+              for (var i = 0; i < drawArea.children.length; i++) {
+                var child = drawArea.children[i];
+                if (child instanceof createjs.Shape && curComment.id === child.name) {
+                  child.alpha = 0.5;
+                }
+                if (child instanceof createjs.Container && curComment.id === child.name) {
+                  child.children.forEach(function (value) {
+                    if (value.name === 'back') {
+                      value.alpha = 0.5;
+                    }
+                  });
+                }
               }
+              hoeditorfactory.drawTree.curOnSelectedComment = null;
+              HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
             }
-            hoeditorfactory.drawTree.curOnSelectedComment = null;
-            //drawArea.stage.update();
-            HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID).drawPageTree.updateDrawPage(dPage.pageIndex);
-            //dline.stage.update();
           }
-
           hoeditorfactory.drawTree.selectRange.spStart = startPos;
           hoeditorfactory.drawTree.selectRange.spEnd = startPos;
-          hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
+          if (aevent.nativeEvent.button === 0) {
+            hoeditorfactory.docTree.curDomRange.setSamePath(startPos.path);
+          }
           hoeditorfactory.drawTree.moveCaretToPath(startPos.path);
           // const selchange = new SelectionChangeEvent(
           //   this._oldRange,
@@ -232614,7 +232792,8 @@ var DrawSelectLevel = /*#__PURE__*/function () {
           this.mouseDownHandle(aevent);
         }
       } else if (aevent.nativeEvent.button === 2) {
-        hoeditorfactory.drawTree.selectRange.beginRangeSelect = false;
+        //hoeditorfactory.drawTree.selectRange.beginRangeSelect = false;
+        this.mouseDownHandle(aevent);
       }
       return true;
     }
@@ -232632,6 +232811,7 @@ var DrawSelectLevel = /*#__PURE__*/function () {
       if (hoeditorfactory.drawTree.inViewPages.indexOf(this._pageIndex) < 0) {
         hoeditorfactory.drawTree.inViewPages.push(this._pageIndex);
       }
+      var y = this._pageIndex * hoeditorfactory.pageProperty.heightPixes;
       // this._scrollYList.push(aevent.stageY);
       if (hoeditorfactory.drawTree.selectRange.beginRangeSelect && (parseInt(aevent.nativeEvent.buttons) && 1) === 1) {
         var _hoeditorfactory$draw2;
@@ -232641,8 +232821,13 @@ var DrawSelectLevel = /*#__PURE__*/function () {
         }
         var endPos = hoeditorfactory.drawTree.getStagePosition(dPage, dPage.activeDrawRect, aevent.stageX, aevent.stageY);
         if (endPos) {
-          // const startLine = Number(hoeditorfactory.docTree.curDomRange.startPath.split('/')[1]);
-          // const endLine = Number(endPos.path.split('/')[1]);
+          if (hoeditorfactory.moveY && hoeditorfactory.canvasListNode) {
+            if (aevent.stageY + y - hoeditorfactory.moveY > 0) {
+              hoeditorfactory.canvasListNode.scrollTop += 13;
+            } else {
+              hoeditorfactory.canvasListNode.scrollTop -= 13;
+            }
+          }
           // const listNode = document.querySelector('.ho-editor-list') as HTMLDivElement;
           // if (listNode) {
           //     if (startLine - endLine > 8) {
@@ -233490,7 +233675,7 @@ var DrawPage = __webpack_require__(72722);
 // 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__(93648);
+var PoperSelect = __webpack_require__(16512);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -235189,7 +235374,7 @@ var ParagraphNode = __webpack_require__(67945);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/MarkNode.ts
 var MarkNode = __webpack_require__(57727);
 ;// CONCATENATED MODULE: ./src/components/version.ts
-/* harmony default export */ var version = ('3.0.39');
+/* harmony default export */ var version = ('3.0.41');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -235896,10 +236081,10 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 });
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocvue_type_script_lang_js_ = (HoDocvue_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/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&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/HoDoc.vue?vue&type=style&index=0&id=41bb5f98&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=1e74a76d&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/HoDoc.vue?vue&type=style&index=0&id=41bb5f98&prod&lang=scss&
 
 ;// CONCATENATED MODULE: ./src/components/HoDoc.vue
 
@@ -235912,8 +236097,8 @@ var defaultHeight = Math.floor(1122 * DrawConfig/* DrawConfig.instance */.f.inst
 
 var HoDoc_component = (0,componentNormalizer/* default */.Z)(
   components_HoDocvue_type_script_lang_js_,
-  HoDocvue_type_template_id_1e74a76d_render,
-  HoDocvue_type_template_id_1e74a76d_staticRenderFns,
+  HoDocvue_type_template_id_41bb5f98_render,
+  HoDocvue_type_template_id_41bb5f98_staticRenderFns,
   false,
   null,
   null,
@@ -240906,7 +241091,7 @@ var StructureConvert = /*#__PURE__*/function () {
         var formularNodes = hoEditorFactory.drawTree.formularNodes;
         var tableArr = [];
         formularNodes.forEach(function (value, key) {
-          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.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea) {
+          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.formularType === TableFormula/* FormularType.ftBodySurfaceArea */.a.ftBodySurfaceArea || value.formularType === TableFormula/* FormularType.ftCalcDays */.a.ftCalcDays) {
             value.updateResult();
             value.getParentCell().drawCell.needUpdate = true;
             // const prevNode = value.previousLeaf();
@@ -248204,6 +248389,61 @@ var VueController = /*#__PURE__*/function () {
         return hasEmptyDoctorSign;
       }
     }
+    /**
+     * 查询是否有空签名元素
+     * @returns boolean
+     */
+  }, {
+    key: "getAllSignNodeList",
+    value: function getAllSignNodeList() {
+      var hoEditorFactory = HOEditorFactorys/* HOEditorFactorys.instance */.b.instance().getFactory(this._hoEditorFactoryID);
+      var signList = [];
+      var patientSignList = [];
+      var getAllNodes = function getAllNodes(nodes) {
+        for (var i = 0; i < nodes.length; i++) {
+          var node = nodes[i];
+          if (node instanceof SignNode/* SignNode */.N) {
+            var sign = {
+              type: 'sign',
+              signed: false,
+              customProperty: node.customProperty
+            };
+            // 有值的患者签名
+            if (node.attribute === 1) {
+              sign.type = 'patientSign';
+              if (node.imgSrc == '' && node.fingerPrintSrc == '') {
+                sign.signed = false;
+                patientSignList.push(sign);
+              } else {
+                sign.signed = true;
+                patientSignList.push(sign);
+              }
+            }
+            // 空的医生签名
+            if (node.attribute != 1) {
+              sign.type = 'sign';
+              if (node.imgSrc == '') {
+                sign.signed = false;
+                signList.push(sign);
+              } else {
+                sign.signed = true;
+                signList.push(sign);
+              }
+            }
+          }
+          if (node instanceof BaseCombineNode/* BaseCombineNode */.V) {
+            // 医生签名不存在的情况不在深层调用深层遍历
+            getAllNodes(node.childNodes);
+          }
+        }
+      };
+      var mainNodes = hoEditorFactory.docTree.mainNodes;
+      getAllNodes(mainNodes);
+      return {
+        sign: signList,
+        patientSign: patientSignList
+      };
+    }
     /**
      * 查询是否存在医生签名
      * @returns boolean
@@ -254227,6 +254467,8 @@ var HOEditorFactory = /*#__PURE__*/function () {
     (0,esm_defineProperty/* default */.Z)(this, "_printSilently", false);
     (0,esm_defineProperty/* default */.Z)(this, "_limitCharNumber", 0);
     (0,esm_defineProperty/* default */.Z)(this, "_reviewJson", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_moveY", void 0);
+    (0,esm_defineProperty/* default */.Z)(this, "_canvasListNode", void 0);
     this._hoEditorFactoryId = id;
   }
   (0,esm_createClass/* default */.Z)(HOEditorFactory, [{
@@ -254266,6 +254508,7 @@ var HOEditorFactory = /*#__PURE__*/function () {
     // 封装浏览器静默打印
     // 限制复制病历文本的字符数
     // 审阅列表菜单权限
+
     /**
      * Getter hoLocalStorage
      * @return {HoLocalStorage}
@@ -255015,6 +255258,26 @@ var HOEditorFactory = /*#__PURE__*/function () {
         this._printSilently = value;
       }
     }
+  }, {
+    key: "canvasListNode",
+    get: function get() {
+      return this._canvasListNode;
+    },
+    set: function set(value) {
+      if (value && this._canvasListNode !== value) {
+        this._canvasListNode = value;
+      }
+    }
+  }, {
+    key: "moveY",
+    get: function get() {
+      return this._moveY;
+    },
+    set: function set(value) {
+      if (value && this._moveY !== value) {
+        this._moveY = value;
+      }
+    }
   }, {
     key: "clear",
     value: function clear() {
@@ -255227,11 +255490,13 @@ var formularType = {
   4: 'expectedDate',
   5: 'pregnantWeeks',
   6: 'ftScoreMapping',
-  7: 'bodySurfaceArea' //体表面积
+  7: 'bodySurfaceArea',
+  8: 'ftCalcDays' //计算天数
 };
 
 var getFormula = function getFormula(tableFormular) {
   // 获取公式类型
+
   return formularType[tableFormular.formularType];
 };
 // EXTERNAL MODULE: ./src/components/common/commondata/index.ts
@@ -256127,10 +256392,10 @@ var commondata = __webpack_require__(76285);
 });
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_HoDocsvue_type_script_lang_js_ = (HoDocsvue_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/HoDocs.vue?vue&type=style&index=0&id=7a9c6e06&prod&lang=scss&media=print&
+;// 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/HoDocs.vue?vue&type=style&index=0&id=1ebd4c64&prod&lang=scss&media=print&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=7a9c6e06&prod&lang=scss&media=print&
+;// CONCATENATED MODULE: ./src/components/HoDocs.vue?vue&type=style&index=0&id=1ebd4c64&prod&lang=scss&media=print&
 
 ;// CONCATENATED MODULE: ./src/components/HoDocs.vue
 
@@ -260311,8 +260576,8 @@ var ToolTablevue_type_template_id_753fa24b_render = function render() {
 };
 var ToolTablevue_type_template_id_753fa24b_staticRenderFns = [];
 
-;// 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/insert/HoTableFeatures.vue?vue&type=template&id=42203191&
-var HoTableFeaturesvue_type_template_id_42203191_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/insert/HoTableFeatures.vue?vue&type=template&id=6ecf79fe&
+var HoTableFeaturesvue_type_template_id_6ecf79fe_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -260357,7 +260622,9 @@ var HoTableFeaturesvue_type_template_id_42203191_render = function render() {
     key: "ftScoreMapping"
   }, [_vm._v("分值映射")]), _c('a-menu-item', {
     key: "bodySurfaceArea"
-  }, [_vm._v("体表面积")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
+  }, [_vm._v("体表面积")]), _c('a-menu-item', {
+    key: "ftCalcDays"
+  }, [_vm._v("计算天数")])], 1)], 1)], 2)], 1) : _vm._e(), _vm.table.insertRowAbove && _vm.tableProperty.canAddRow ? _c('div', {
     directives: [{
       name: "debounce",
       rawName: "v-debounce:1000.click",
@@ -260515,7 +260782,7 @@ var HoTableFeaturesvue_type_template_id_42203191_render = function render() {
     staticClass: "ho-emr-tool-item"
   }, [_c('span', [_vm._v("取消合并单元格")])]) : _vm._e()]);
 };
-var HoTableFeaturesvue_type_template_id_42203191_staticRenderFns = [];
+var HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/toolbar/insert/HoTableFeatures.vue?vue&type=script&lang=js&
 
@@ -260675,7 +260942,8 @@ var HoTableFeaturesvue_type_template_id_42203191_staticRenderFns = [];
         labor: '产程计算公式',
         expectedDate: '预产期计算公式',
         ftScoreMapping: '分值映射计算公式',
-        bodySurfaceArea: '体表面积公式'
+        bodySurfaceArea: '体表面积公式',
+        ftCalcDays: '计算天数公式'
       };
       if (formula[formulaType] === 'code') {
         this.setCellCode();
@@ -260750,8 +261018,8 @@ var HoTableFeaturesvue_type_template_id_42203191_staticRenderFns = [];
 ;
 var HoTableFeatures_component = (0,componentNormalizer/* default */.Z)(
   insert_HoTableFeaturesvue_type_script_lang_js_,
-  HoTableFeaturesvue_type_template_id_42203191_render,
-  HoTableFeaturesvue_type_template_id_42203191_staticRenderFns,
+  HoTableFeaturesvue_type_template_id_6ecf79fe_render,
+  HoTableFeaturesvue_type_template_id_6ecf79fe_staticRenderFns,
   false,
   null,
   null,
@@ -262189,7 +262457,8 @@ var popper = __webpack_require__(95551);
         expectedDate: '预产期公式',
         pregnantWeeks: '孕周公式',
         ftScoreMapping: '分值映射公式',
-        bodySurfaceArea: '体表面积'
+        bodySurfaceArea: '体表面积公式',
+        ftCalcDays: '计算天数公式'
       },
       isPasted: false,
       isWebview: false,