hoeditor-web 3.0.1 → 3.0.2

package/lib/hoeditor.umd.js

@@ -8988,7 +8988,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 92206:
+/***/ 64497:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -9008,7 +9008,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=7c8cfd5f&
+;// 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=c70794f6&
 
 
 
@@ -9238,8 +9238,8 @@ var render = function render() {
       "open": true,
       "locale": _vm.locale,
       "showToday": false,
-      "format": _vm.dateTimeStyle.replace(/dd/g, 'DD'),
-      "valueFormat": _vm.dateTimeStyle.replace(/dd/g, 'DD')
+      "format": _vm.dateTimeStyle.replace(/dd/g, 'DD').split(' ')[0],
+      "valueFormat": _vm.dateTimeStyle.replace(/dd/g, 'DD').split(' ')[0]
     },
     scopedSlots: _vm._u([{
       key: "dateRender",
@@ -9365,12 +9365,14 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=7c8cfd5f&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=template&id=c70794f6&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.assign.js
 var es_object_assign = __webpack_require__(19601);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__(41539);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/web.dom-collections.for-each.js
@@ -9379,8 +9381,6 @@ 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.function.name.js
-var es_function_name = __webpack_require__(68309);
 // 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
@@ -11477,52 +11477,14 @@ var type = __webpack_require__(41542);
     if (this.poperType === 'datePoper') {
       if (currentPoperNode instanceof DateTimeNode/* DateTimeNode */.Z) {
         this.dateTimeStyle = currentPoperNode.controlStyle;
-        // const style = currentPoperNode.controlStyle?.replace(/\hh/g, 'HH');
-        // if ((style.includes('yyyy') || style.includes('MM')) && style.includes('HH')) {
-        //     this.dateStyle = style.split(' ')[0] ? style.split(' ')[0] : 'yyyy/MM/dd';
-        //     this.timeStyle = style.split(' ')[1] ? style.split(' ')[1] : 'HH:mm:ss';
-        // } else {
-        //     if (style.includes('yyyy') || style.includes('MM')) {
-        //         this.dateStyle = style;
-        //     }
-        //     if (style.includes('HH') || style.includes('mm')) {
-        //         this.timeStyle = style;
-        //     }
-        // }
         var val = currentPoperNode.text.split(' ');
-        this.date = val[0] ? val[0] : null;
-        this.time = val[1] ? val[1] : null;
-        // let text = currentPoperNode.text.replace(/['年'|'月'|'-']/g, '/').replace(/['日']/g, '');
-        // if (text && this.dateStyle && !this.dateStyle.includes('yyyy')) text = dateFormat(new Date(), 'yyyy') + '/' + text;
-        // if (text && text[text.length - 1] === ':') text = text.substr(0, text.length - 1);
-
-        // if (text && (isDate(text) || isDate('2021/10/08 ' + text))) {
-        //     if ((style.includes('yyyy') || style.includes('MM')) && (style.includes('HH') || style.includes('mm'))) {
-        //         this.date = text.split(' ')[0];
-        //         this.time = text;
-        //     } else {
-        //         if (style.includes('yyyy') || style.includes('MM')) {
-        //             this.date = text;
-        //         }
-        //         if (style.includes('HH') || style.includes('mm')) {
-        //             this.time = dateFormat(new Date(), 'yyyy/MM/dd ') + text;
-        //         }
-        //     }
-        // } else {
-        //     this.date = dateFormat(new Date(), 'yyyy/MM/dd');
-        //     if (this.timeStyle) this.time = dateFormat(new Date(), 'yyyy/MM/dd ' + this.timeStyle);
-        // }
+        this.date = val[0] ? val[0] : '';
+        this.time = val[1] ? val[1] : '';
+        if (this.date === currentPoperNode.name) {
+          this.date = '';
+        }
       }
-      // this.date = this.date?.replace(/[^\d]/g, '/');
-
       var height = 90;
-      // if (currentPoperNode.controlStyle.includes('yyyy') || currentPoperNode.controlStyle.includes('MM')) height = 300;
-      // if (currentPoperNode.controlStyle.includes('HH') || currentPoperNode.controlStyle.includes('mm')) height = 90;
-      // if (
-      //     (currentPoperNode.controlStyle.includes('yyyy') || currentPoperNode.controlStyle.includes('MM')) &&
-      //     (currentPoperNode.controlStyle.includes('HH') || currentPoperNode.controlStyle.includes('mm'))
-      // )
-      //     height = 350;
       this.posStyle = this.computedPoperPosition(height, this.poperPos);
     } else {
       var _this$poperSelectList;
@@ -11568,13 +11530,9 @@ var type = __webpack_require__(41542);
           name: 'preventOverflow',
           options: {
             padding: 8
-            // mainAxis: false, // true by default
-            // altAxis: true, // false by default
-            // padding: { left: selectCanvasSize.left, right: selectCanvasSize.right, top: selectCanvasSize.top, bottom: selectCanvasSize.bottom },
           }
         }]
       });
-
       setTimeout(function () {
         if (_this2.poppernIstance) {
           _this2.poppernIstance.update();
@@ -11660,26 +11618,7 @@ var type = __webpack_require__(41542);
       });
     },
     sureDate: function sureDate() {
-      // let value = '';
-      // if (this.date) {
-      //     value = this.date;
-      //     if (this.time) {
-      //         const time = this.time
-      //             .replace(/年|月|-/g, '/')
-      //             .replace(/时|分/g, ':')
-      //             .replace(/秒/g, '');
-      //         if (time.includes('/')) {
-      //             value += ' ' + time.split(' ')[1];
-      //         } else {
-      //             value += ' ' + time;
-      //         }
-      //     }
-      // } else {
-      //     value = '2021/10/08 ' + this.time.replace(/[^\d]/g, ':').substr(0, 8);
-      // }
       var node = this.getCurrentPoperNode();
-      // value = this.dateFormat(value, node.controlStyle);
-
       var value = '';
       if (node.controlStyle.includes('mm') && node.controlStyle.includes(' ')) {
         value = this.date + ' ' + this.time;
@@ -11981,10 +11920,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=7c8cfd5f&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=c70794f6&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=7c8cfd5f&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/poperSelect/PoperSelect.vue?vue&type=style&index=0&id=c70794f6&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -15275,7 +15214,7 @@ var component = (0,componentNormalizer/* default */.Z)(
 
 /***/ }),
 
-/***/ 20605:
+/***/ 14776:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -15295,7 +15234,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/table/TableCellPoper.vue?vue&type=template&id=63b2f752&
+;// 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/TableCellPoper.vue?vue&type=template&id=08459377&
 
 
 
@@ -15432,8 +15371,8 @@ var render = function render() {
       "open": true,
       "locale": _vm.locale,
       "showToday": false,
-      "format": _vm.inputStyle.replace(/dd/g, 'DD'),
-      "valueFormat": _vm.inputStyle.replace(/dd/g, 'DD')
+      "format": _vm.inputStyle.replace(/dd/g, 'DD').split(' ')[0],
+      "valueFormat": _vm.inputStyle.replace(/dd/g, 'DD').split(' ')[0]
     },
     scopedSlots: _vm._u([{
       key: "dateRender",
@@ -15559,10 +15498,12 @@ var render = function render() {
 };
 var staticRenderFns = [];
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=63b2f752&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=template&id=08459377&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(61748);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.function.name.js
+var es_function_name = __webpack_require__(68309);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__(41539);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.split.js
@@ -15605,6 +15546,7 @@ var HOEditorFactorys = __webpack_require__(74089);
 
 
 
+
 /* harmony default export */ var TableCellPopervue_type_script_lang_js_ = ({
   name: 'TableCellPoper',
   mixins: [appendToBody/* default */.Z],
@@ -15728,8 +15670,11 @@ var HOEditorFactorys = __webpack_require__(74089);
           text = this.dateFormat(new Date(), this.inputStyle);
         }
         var val = text.split(' ');
-        this.date = val[0] ? val[0] : null;
-        this.time = val[1] ? val[1] : null;
+        this.date = val[0] ? val[0] : '';
+        this.time = val[1] ? val[1] : '';
+        if (this.date === currentPoperNode.name) {
+          this.date = '';
+        }
         // if ((this.inputStyle.includes('yyyy') || this.inputStyle.includes('MM')) && this.inputStyle.includes('HH')) {
         //     this.dateStyle = this.inputStyle.split(' ')[0] ? this.inputStyle.split(' ')[0] : 'yyyy/MM/dd';
         //     this.timeStyle = this.inputStyle.split(' ')[1] ? this.inputStyle.split(' ')[1] : 'HH:mm:ss';
@@ -15929,10 +15874,10 @@ var HOEditorFactorys = __webpack_require__(74089);
 });
 ;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=script&lang=js&
  /* harmony default export */ var table_TableCellPopervue_type_script_lang_js_ = (TableCellPopervue_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/TableCellPoper.vue?vue&type=style&index=0&id=63b2f752&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/TableCellPoper.vue?vue&type=style&index=0&id=08459377&prod&lang=scss&
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=63b2f752&prod&lang=scss&
+;// CONCATENATED MODULE: ./src/components/controls/table/TableCellPoper.vue?vue&type=style&index=0&id=08459377&prod&lang=scss&
 
 // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(70713);
@@ -186814,7 +186759,7 @@ var map = {
 	"./pageInfoes/PageInfoes.vue": 17481,
 	"./paragraph/ParagraphDialog.vue": 54949,
 	"./poperSelect/PoperMark.vue": 71472,
-	"./poperSelect/PoperSelect.vue": 92206,
+	"./poperSelect/PoperSelect.vue": 64497,
 	"./poperTipText/PoperTipText.vue": 15845,
 	"./popers/Poper.vue": 57937,
 	"./popers/Title.vue": 89987,
@@ -186823,7 +186768,7 @@ var map = {
 	"./radioCheckBox/RadioCheckbox.vue": 18971,
 	"./selectDialog/SelectDialog.vue": 26679,
 	"./sign/Sign.vue": 99163,
-	"./table/TableCellPoper.vue": 20605,
+	"./table/TableCellPoper.vue": 14776,
 	"./table/TableCellProperty.vue": 71176,
 	"./table/TableColProperty.vue": 2116,
 	"./table/TableForm.vue": 19064,
@@ -224998,7 +224943,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__(92206);
+var PoperSelect = __webpack_require__(64497);
 // EXTERNAL MODULE: ./src/components/controls/poperSelect/PoperMark.vue + 5 modules
 var PoperMark = __webpack_require__(71472);
 ;// CONCATENATED MODULE: ./src/components/controls/poperSelect/index.ts
@@ -225006,7 +224951,7 @@ var PoperMark = __webpack_require__(71472);
 
 
 // EXTERNAL MODULE: ./src/components/controls/table/TableCellPoper.vue + 6 modules
-var TableCellPoper = __webpack_require__(20605);
+var TableCellPoper = __webpack_require__(14776);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DateTimeNode.ts
 var DateTimeNode = __webpack_require__(92501);
 // EXTERNAL MODULE: ./src/editor/dom/treeNode/DownListNode.ts
@@ -226693,7 +226638,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 = ('3.0.1');
+/* harmony default export */ var version = ('3.0.2');
 // EXTERNAL MODULE: ./src/components/controls/poperTipText/PoperTipText.vue + 5 modules
 var PoperTipText = __webpack_require__(15845);
 ;// CONCATENATED MODULE: ./src/components/controls/poperTipText/index.ts
@@ -232216,6 +232161,7 @@ var NodePosition = __webpack_require__(42921);
 
 
 
+
 
 // import { HTMLConverter2 } from "./HTMLConverter";
 
@@ -232589,10 +232535,13 @@ var StructureNode = /*#__PURE__*/function () {
       this._html = this._Convertor.toTHML();
       this._text = this._Convertor.toText();
       if (clipboard) {
+        var patientID = hoEditorFactory.docTree.docProperty.patientID;
         if (this._json != "") {
-          var patientID = hoEditorFactory.docTree.docProperty.patientID;
           this._json = patientID + ":" + this._json;
         }
+        if (this._html !== "") {
+          this._html = this._html.replace('<!--StartFragment-->', "<!--StartFragment--><!--:".concat(patientID, "-->"));
+        }
         clipboard.setData(ClipboardType.ctJSON, this._json);
         clipboard.setData(ClipboardType.ctHTML, this._html);
         clipboard.setData(ClipboardType.ctText, this._text);
@@ -239932,6 +239881,11 @@ var DomController = /*#__PURE__*/function () {
 
 
 
+
+
+
+
+
 
 
 
@@ -240240,14 +240194,23 @@ var EditController = /*#__PURE__*/function () {
         return;
       }
       var nodes;
-      if (!jsonData) {
+      if (!jsonData || !htmlData) {
         if (hoeditorfactory.notAllowCrossPatiPaste && hoeditorfactory.drawTree.paintStatus !== DrawTree/* PaintState.psDesign */.Dh.psDesign) {
           message/* default.warn */.Z.warn("不能将他人病历内容复制粘贴到该患者病历中");
           return;
         }
       }
+      var patientID = '';
+      if (jsonData) {
+        patientID = jsonData.split(":")[0];
+      } else if (htmlData) {
+        var reg = new RegExp('<!--:' + '(.*?)' + '-->');
+        var htmls = htmlData.match(reg);
+        if (htmls) {
+          patientID = htmlData.match(reg)[1];
+        }
+      }
       if (jsonData) {
-        var patientID = jsonData.split(":")[0];
         var index = jsonData.indexOf(":");
         jsonData = jsonData.substring(index + 1, jsonData.length);
         if (hoeditorfactory.drawTree.paintStatus === DrawTree/* PaintState.psDesign */.Dh.psDesign) {