@hailin-zheng/editor-core 1.1.6 → 1.1.8

package/index.js

@@ -4172,15 +4172,10 @@ class TableUtil {
                 const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
                 if (vMergeEndIndex > rowIndex) {
                     const nextRow = tb.getChild(rowIndex + 1);
-                    nextRow.getChild(i).props.vMerge = vMergeEndIndex - rowIndex > 2 ? 'restart' : null;
+                    nextRow.getChild(i).props.vMerge = vMergeEndIndex - rowIndex > 1 ? 'restart' : null;
                 }
             }
             else if (cell.props.vMerge === 'continue') {
-                // const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
-                // if (vMergeEndIndex > rowIndex) {
-                //     const nextRow = tb.getChild<TableRowElement>(rowIndex + 1);
-                //     nextRow.getChild<TableCellElement>(i).cellProps.vMerge = 'continue';
-                // }
                 const vMergeStartIndex = this.getVMergeStartIndex(tb, rowIndex, i);
                 const vMergeEndIndex = this.getVMergeEndIndex(tb, rowIndex, i);
                 //当前单元格处于合并行的最后一行，并且合并的行数为2行
@@ -4293,6 +4288,13 @@ class TableUtil {
                     currCell.props.vMerge = i === tbRegion.startRow ? 'restart' : 'continue';
                     currCell.props.hMerge = 'restart';
                 }
+                //选择的行数一行，此时纵向合并不需要设置
+                if (tbRegion.endRow === tbRegion.startRow) {
+                    currCell.props.vMerge = null;
+                }
+                if (tbRegion.startCol === tbRegion.endCol) {
+                    currCell.props.hMerge = null;
+                }
                 if (currCell !== startCell) {
                     cellContents.push(...ElementUtil.getChildrenElements(currCell));
                     currCell.clearItems();
@@ -4432,6 +4434,13 @@ class TableUtil {
         tb.pubOnChange('self');
         tb.refreshView();
     }
+    /**
+     * 在指定位置插入行
+     * 动作：在指定行上方或者下方插入行
+     * 原则：插入的行单元格尽量不纵向合并
+     * @param ss
+     * @param insertRowIndex
+     */
     static insertRow(ss, insertRowIndex) {
         const startCell = ElementUtil.getParentByType(ss.startControl, TableCellElement);
         if (!startCell?.parent) {
@@ -4439,7 +4448,7 @@ class TableUtil {
         }
         const startRow = startCell.parent;
         const tb = startRow.parent;
-        const currRowIndex = startRow.getIndex();
+        startRow.getIndex();
         insertRowIndex = insertRowIndex < 0 ? 0 : insertRowIndex;
         insertRowIndex = insertRowIndex > tb.length ? tb.length : insertRowIndex;
         const newRow = TableRowElement.createRow(tb.getColsCount());
@@ -4457,16 +4466,12 @@ class TableUtil {
             if (destCell.props.vMerge === 'continue') {
                 //获取合并列的最后的行索引
                 const vMergeEndRowIndex = this.getVMergeEndIndex(tb, insertRowIndex, i);
-                if (vMergeEndRowIndex > insertRowIndex || (vMergeEndRowIndex === insertRowIndex && currRowIndex < insertRowIndex)) {
+                //当前单元格处于纵向合并的单元格之中
+                if (vMergeEndRowIndex >= insertRowIndex) {
                     newCell.props.vMerge = 'continue';
-                    //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
                 }
             }
-            else if (destCell.props.vMerge === 'restart' && currRowIndex > insertRowIndex) {
-                //在上方新增行，目标行单元格属于合并的起点
-                newCell.props.vMerge = 'continue';
-                //newCell.cellProps.hMerge = destCell.cellProps.hMerge;
-            }
+            newCell.props.hMerge = destCell.props.hMerge;
         }
         tb.addChild(newRow, insertRowIndex);
         tb.refreshView();
@@ -5167,6 +5172,11 @@ class TextGroupFactory extends ElementFactory {
 }
 
 class ElementSerialize {
+    /**
+     * 将当前文档对象构建并输出到标准的JSON对象
+     * @param element
+     * @param viewOptions
+     */
     static serialize(element, viewOptions) {
         if (element instanceof BranchElement) {
             const result = element.serialize(viewOptions);
@@ -7967,7 +7977,7 @@ class DataElementDate extends DataElementInlineGroup {
             return res;
         }
         const format = this.props.format ?? 'YYYY-MM-DD';
-        const date = moment(this.getValue(), format);
+        const date = moment(this.getValue(), format, true);
         if (!date.isValid()) {
             return '日期格式不正确';
         }
@@ -13682,24 +13692,6 @@ class DocumentEvent {
         this.editor.addEventListener('contextmenu', evt => {
             this.contextMenu.next(evt.sourceEvt);
         });
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'mousedown').subscribe((evt) => {
-        //     this.mousedown(evt);
-        // }));
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'mouseup').subscribe((evt) => {
-        //     this.mouseup(evt);
-        // }));
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'click').subscribe((evt) => {
-        //     this.mouseClickHandle(evt);
-        // }));
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'contextmenu').subscribe((evt) => {
-        //     this.contextMenu.next(evt);
-        // }));
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'mousemove').subscribe((evt) => {
-        //     this.mousemove(evt);
-        // }));
-        // this.addSubEvent(fromEvent<MouseEvent>(this.canvas, 'dblclick').subscribe((evt) => {
-        //     this.mouseDblClickHandle(evt);
-        // }));
         this.documentInput.onLeftEvent.subscribe(() => {
             this.moveCursorToLeft();
         });
@@ -14443,17 +14435,27 @@ class DocumentEvent {
         const moveDistanceX = this.currentPos.x - mousedownPos.x;
         const moveDistanceY = this.currentPos.y - mousedownPos.y;
         const row = cellElement.parent;
+        const minColWidth = 20;
         const table = row?.parent;
         if (!row || !table) {
             throw new Error('row | table is null');
         }
         const cellIndex = row.getChildIndex(cellElement);
         let cellWidth = table.getCellWidth(cellIndex);
-        table.getColsCount();
         if (['left', 'right'].includes(border)) {
             if (cellIndex === 0 && border === 'left') {
                 return;
             }
+            //当前操作的是表格的最后一列
+            if (cellIndex === table.getColsCount() - 1 && border === 'right') {
+                cellWidth += moveDistanceX;
+                if (cellWidth < minColWidth) {
+                    return;
+                }
+                table.setCellWidth(cellIndex, cellWidth);
+                this.edgeRenderInfo.mousedownPos = this.currentPos;
+                return;
+            }
             let resizeColWidth = 0;
             let resizeColIndex = 0;
             if (border === 'left') {
@@ -14471,14 +14473,13 @@ class DocumentEvent {
                 }
                 cellWidth += moveDistanceX;
             }
-            if (resizeColWidth < 20 || cellWidth < 20) {
+            if (resizeColWidth < minColWidth || cellWidth < minColWidth) {
                 return;
             }
             console.log(resizeColWidth, cellWidth);
             table.setCellWidth(resizeColIndex, resizeColWidth);
             table.setCellWidth(cellIndex, cellWidth);
             this.edgeRenderInfo.mousedownPos = this.currentPos;
-            table.pubOnChange('self');
         }
         else if (['bottom', 'top'].includes(border)) {
             let rowIndex = row.getIndex();
@@ -21142,6 +21143,36 @@ class CanvasTextEditor extends AbsolutePanel {
             appCtx.root.setInputPosition(caretPos);
         }
     }
+    generatorDoc(data) {
+        //根据传入的参数，动态生成病情信息的结构化报告
+        const para = new ParagraphElement();
+        //创建患者姓名文本标签
+        const patNameLabel = new TextGroupElement();
+        patNameLabel.text = "患者姓名:";
+        //添加到段落中
+        para.addChild(patNameLabel);
+        //创建患者姓名数据元
+        const patNameDataEle = new DataElementText();
+        patNameDataEle.props.valueTextProps = new TextProps();
+        patNameDataEle.props.valueTextProps.fontName = '宋体';
+        patNameDataEle.props.valueTextProps.fontSize = 16;
+        //数据元赋值
+        patNameDataEle.setValue(data.patName);
+        //添加到段落中
+        para.addChild(patNameDataEle);
+        //添加到正文中
+        this.docCtx.document.bodyElement.addChild(para);
+    }
+    /**
+     * 设置关键字
+     * 匹配用户输入的关键字，回调到应用业务中处理
+     */
+    setKeywords(keys, cb) {
+    }
+    /**
+     * 注册编辑器格式读取器
+     */
+    registerReaderFactory(handler) { }
 }
 
 /**