@hailin-zheng/editor-core 2.0.11 → 2.0.13

package/index.js

@@ -6497,7 +6497,7 @@ class TableRenderObject extends MuiltBlockLineRenderObject {
             if (prevVerticalLines) {
                 for (let k = 0; k < currVerticalLines.length; k++) {
                     const currVerticalLine = currVerticalLines[k];
-                    const matchItem = prevVerticalLines.find(item => item.x === currVerticalLine.x);
+                    const matchItem = prevVerticalLines.find(item => item.x === currVerticalLine.x && currVerticalLine.y === item.y + item.height);
                     if (matchItem) {
                         matchItem.height += currVerticalLine.height;
                         currVerticalLines[k] = matchItem;
@@ -10770,24 +10770,24 @@ class DataElementCheckRenderObject extends LeafRenderObject {
         let { width, height } = this.rect;
         width -= 4;
         t.children = [];
-        if (!props.drawStateChar || props.border) {
-            t.children.push({
-                sel: 'rect',
-                data: {
-                    ns: "http://www.w3.org/2000/svg",
-                    attrs: {
-                        x: 2,
-                        y: 0,
-                        width,
-                        height,
-                        stroke: 'black',
-                        fill: 'none',
-                        'stroke-width': 1
-                    }
-                }
-            });
-        }
         if (props.drawStateChar) {
+            if (props.border) {
+                t.children.push({
+                    sel: 'rect',
+                    data: {
+                        ns: "http://www.w3.org/2000/svg",
+                        attrs: {
+                            x: 2,
+                            y: 0,
+                            width,
+                            height,
+                            stroke: 'black',
+                            fill: 'none',
+                            'stroke-width': 1
+                        }
+                    }
+                });
+            }
             const str = props.checked ? props.trueChar : props.falseChar;
             t.children.push({
                 sel: 'text',
@@ -10806,8 +10806,23 @@ class DataElementCheckRenderObject extends LeafRenderObject {
             });
         }
         else {
-            if (props.checked) {
-                if (props.multiSelect) {
+            if (props.multiSelect) {
+                t.children.push({
+                    sel: 'rect',
+                    data: {
+                        ns: "http://www.w3.org/2000/svg",
+                        attrs: {
+                            x: 2,
+                            y: 0,
+                            width,
+                            height,
+                            stroke: 'black',
+                            fill: 'none',
+                            'stroke-width': 1
+                        }
+                    }
+                });
+                if (props.checked) {
                     const paths = ElementUtil.getCheckboxPath(2, 0, props.size, props.size);
                     t.children.push({
                         sel: 'path',
@@ -10824,7 +10839,23 @@ class DataElementCheckRenderObject extends LeafRenderObject {
                         }
                     });
                 }
-                else {
+            }
+            else {
+                t.children.push({
+                    sel: 'circle',
+                    data: {
+                        ns: "http://www.w3.org/2000/svg",
+                        attrs: {
+                            cx: width / 2,
+                            cy: height / 2,
+                            r: width / 3,
+                            stroke: 'black',
+                            fill: 'none',
+                            'stroke-width': 1
+                        }
+                    }
+                });
+                if (props.checked) {
                     t.children.push({
                         sel: 'circle',
                         data: {
@@ -11426,6 +11457,9 @@ class DataElementText extends DataElementInlineGroup {
         }
         this.pubOnChange('self');
         this.clearInnerItems();
+        if (typeof val !== 'string') {
+            val += '';
+        }
         if (val) {
             const items = val.split('<br/>');
             if (items.length) {
@@ -13546,9 +13580,11 @@ class DynamicContextParser {
     getControlById(id) {
         if (!this.cacheList) {
             const ctx = new DocumentContext(this.doc, this.ss);
-            this.cacheList = ctx.getControlInstanceList();
+            this.cacheList = ctx.getDataElementModelList();
         }
-        return this.cacheList.find(item => item['props']['id'] === id);
+        const f = this.cacheList.find(item => item.id === id);
+        return f;
+        //return this.cacheList.find(item => item['props']['id'] === id);
     }
     getObject(id) {
         new DocumentContext(this.doc, this.ss);
@@ -25711,11 +25747,13 @@ class EditorCalendarVNode {
     }
     render(position, dataValue) {
         if (!this.currentDate && dataValue) {
-            this.currYear.value = moment(dataValue).year();
-            this.currMonth.value = moment(dataValue).month();
-            this.selectedDate.value = moment(dataValue).format('YYYY-MM-DD');
+            const currDataValue = moment(dataValue);
+            this.currYear.value = currDataValue.year();
+            this.currMonth.value = currDataValue.month();
+            this.selectedDate.value = currDataValue.format('YYYY-MM-DD');
             this.currentDate = dataValue;
-            this.currTime.value = moment(dataValue).format('HH:mm:ss');
+            this.currTime.value = currDataValue.format('HH:mm:ss');
+            this.selectedTime.value = this.currTime.value;
         }
         if (!this.currentDate) {
             this.currentDate = moment().format('YYYY-MM-DD');
@@ -25911,7 +25949,7 @@ class EditorCalendarVNode {
         this.currYear.value = new Date().getFullYear();
         this.currMonth.value = new Date().getMonth();
         this.currCalendarMode.value = 'day';
-        this.selectedDate.value = null;
+        this.selectedDate.value = moment().format('YYYY-MM-DD');
     }
     onClickDayYearPart() {
         this.currCalendarMode.value = 'year';
@@ -26602,7 +26640,7 @@ class DocEditor {
                     children: [listVNode.render(), calendarFunc.render(), menuFunc.render()]
                 };
                 return {
-                    sel: 'div#svg-container.svg-container',
+                    sel: 'div.svg-container',
                     data: {
                         style: {
                             cursor: this.viewOptions.cursor