@hailin-zheng/editor-core 2.1.4 → 2.1.6

package/index.js

@@ -2463,6 +2463,7 @@ class DataEleDateProps extends DataEleBaseTextProps {
     minValue;
     maxValue;
     format;
+    value;
     clone(dest) {
         const clone = dest ?? new DataEleDateProps();
         super.clone(clone);
@@ -2475,7 +2476,8 @@ class DataEleDateProps extends DataEleBaseTextProps {
         const props = {
             minValue: this.minValue,
             maxValue: this.maxValue,
-            format: this.format
+            format: this.format,
+            value: this.value
         };
         this.getBaseProps(props, options);
         return props;
@@ -8611,6 +8613,7 @@ class DataElementDate extends DataElementInlineGroup {
     setValue(val) {
         if (val === null) {
             this.clearInnerItems();
+            this.props.value = '';
             return;
         }
         const format = this.props.format ?? 'YYYY-MM-DD';
@@ -8624,18 +8627,24 @@ class DataElementDate extends DataElementInlineGroup {
         }
         this.pubOnChange('self');
         this.clearInnerItems();
+        this.props.value = date.format('YYYY-MM-DD HH:mm:ss');
         const valueText = new TextGroupElement();
         this.props.valueTextProps.clone(valueText.props);
         valueText.text = formatStr;
         this.addChild(valueText, this.length - 1);
         this.onChangedValidate();
     }
-    isValid(val) {
-        const format = this.props.format ?? 'YYYY-MM-DD';
+    isValid(val, format) {
+        if (!format) {
+            format = this.props.format ?? 'YYYY-MM-DD';
+        }
         const date = moment(val, format);
         return date.isValid();
     }
     getValue() {
+        if (this.props.value) {
+            return this.props.value;
+        }
         return ElementSerialize.serializeString(this);
     }
     validate() {
@@ -8682,6 +8691,7 @@ class DataElementDateFactory extends DataElementBaseFactory {
         dataEleProps.minValue = props.minValue;
         dataEleProps.maxValue = props.maxValue;
         dataEleProps.format = props.format;
+        dataEleProps.value = props.value ?? '';
         //dataEleProps.caption = props.caption;
         //dataEleProps.type = props.type;
         dataEleProps.nullText = props.nullText;
@@ -28078,10 +28088,15 @@ class DocEditor {
             const index = docRender.getIndex();
             const cursorPos = DocumentCursor.getElementCursorPos(ele, 0, region, index);
             //this.selectionState.resetRange(element, 0);
+            this.documentEvent.mousedownPos = cursorPos.rect;
             this.scrollToPosition(cursorPos.rect);
         }
     }
     scrollToPosition(pos) {
+        const scale = this.viewOptions.scale;
+        //处理缩放
+        pos.x = pos.x * scale;
+        pos.y = pos.y * scale;
         if (pos.y - this.viewOptions.pageOffset.y > 0 && pos.y - this.viewOptions.pageOffset.y < this.viewOptions.viewSettings.height) {
             return;
         }
@@ -28558,10 +28573,10 @@ class DocEditor {
                 if (dataEle && dataEle instanceof DataElementDate && dataEle.props.editable) {
                     const position = editor.getDataElementPosition(dataEle.startDecorate);
                     let currVal = dataEle.getValue();
-                    if (!dataEle.isValid(currVal)) {
+                    if (!dataEle.isValid(currVal, 'YYYY-MM-DD HH:mm:ss')) {
                         currVal = '';
                     }
-                    return calendar.render(position, currVal, dataEle.props.format);
+                    return calendar.render(position, currVal);
                 }
                 calendar.reset();
                 return null;
@@ -28625,7 +28640,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.4";
+        return "2.1.6";
     }
 }