@meta2d/core 1.0.67 → 1.0.68

package/src/core.js

@@ -1,4 +1,4 @@
-import { commonAnchors, commonPens, cube } from './diagrams';
+import { commonAnchors, commonPens, cube, reset, updateFormData } from './diagrams';
 import { Canvas } from './canvas';
 import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction, calcWorldAnchors, getGlobalColor, isDomShapes, } from './pen';
 import { rotatePoint } from './point';
@@ -16,6 +16,7 @@ import { getter } from './utils/object';
 import { getCookie, getMeta2dData, queryURLParams } from './utils/url';
 import { HotkeyType } from './data';
 import { Message, messageList } from './message';
+import { le5leTheme } from './theme';
 export class Meta2d {
     store;
     canvas;
@@ -146,12 +147,9 @@ export class Meta2d {
             ruleColor: this.store.theme[theme].ruleColor,
             ruleOptions: this.store.theme[theme].ruleOptions,
         });
+        // 更新全局的主题css变量 
+        le5leTheme.updateCssRule(this.store.id, theme);
         this.render();
-        // 更新pen的主题
-        for (let i = 0; i < this.store.data.pens.length; i++) {
-            const pen = this.store.data.pens[i];
-            pen.onSetTheme?.(theme, this.store.theme[theme]);
-        }
     }
     setDatabyOptions(options = {}) {
         const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, x = 0, y = 0, } = options;
@@ -181,6 +179,10 @@ export class Meta2d {
         }
         this.resize();
         this.canvas.listen();
+        // 创建主题样式表
+        if (this.store.data.theme) {
+            le5leTheme.createThemeSheet(this.store.data.theme, this.store.id);
+        }
     }
     initEventFns() {
         this.events[EventAction.Link] = (pen, e) => {
@@ -357,7 +359,7 @@ export class Meta2d {
             if (e.params && typeof e.params === 'string') {
                 let url = e.params;
                 if (e.params.includes('${')) {
-                    let keys = e.params.match(/(?<=\$\{).*?(?=\})/g);
+                    let keys = e.params.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys?.forEach((key) => {
                             url = url.replace(`\${${key}}`, pen[key]);
@@ -390,7 +392,7 @@ export class Meta2d {
                             }
                             else if (typeof item.value[key] === 'string' &&
                                 item.value[key]?.indexOf('${') > -1) {
-                                let keys = item.value[key].match(/(?<=\$\{).*?(?=\})/g);
+                                let keys = item.value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                                 if (keys?.length) {
                                     list[index].properties[key] =
                                         _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
@@ -423,6 +425,10 @@ export class Meta2d {
                 if (pen.deviceId) {
                     value.deviceId = pen.deviceId;
                 }
+                if (pen.formId && pen.formData) {
+                    //表单数据
+                    Object.assign(value, pen.formData);
+                }
                 this.sendDataToNetWork(value, pen, e);
                 return;
                 // }
@@ -437,7 +443,7 @@ export class Meta2d {
                         }
                         else if (typeof value[key] === 'string' &&
                             value[key]?.indexOf('${') > -1) {
-                            let keys = value[key].match(/(?<=\$\{).*?(?=\})/g);
+                            let keys = value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                             if (keys?.length) {
                                 value[key] = _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
                             }
@@ -499,7 +505,7 @@ export class Meta2d {
                     }
                     else if (typeof item.value[key] === 'string' &&
                         item.value[key]?.indexOf('${') > -1) {
-                        let keys = item.value[key].match(/(?<=\$\{).*?(?=\})/g);
+                        let keys = item.value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                         if (keys?.length) {
                             value[key] = _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
                         }
@@ -514,7 +520,7 @@ export class Meta2d {
             return value;
         }
         else
-            return null;
+            return {};
     }
     message(options) {
         const message = new Message(this.canvas.parentElement, options);
@@ -588,7 +594,7 @@ export class Meta2d {
             if (typeof network.headers === 'object') {
                 for (let i in network.headers) {
                     if (typeof network.headers[i] === 'string') {
-                        let keys = network.headers[i].match(/(?<=\$\{).*?(?=\})/g);
+                        let keys = network.headers[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                         if (keys) {
                             network.headers[i] = network.headers[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
                         }
@@ -606,7 +612,7 @@ export class Meta2d {
             }
             if (network.method === 'POST') {
                 if (url.indexOf('${') > -1) {
-                    let keys = url.match(/(?<=\$\{).*?(?=\})/g);
+                    let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys.forEach((key) => {
                             url = url.replace(`\${${key}}`, getter(pen, key) || this.getDynamicParam(key));
@@ -770,6 +776,10 @@ export class Meta2d {
         this.clear(false, data?.template);
         this.canvas.autoPolylineFlag = true;
         if (data) {
+            // 根据图纸的主题设置主题 
+            if (data.theme) {
+                this.setTheme(data.theme);
+            }
             this.setBackgroundImage(data.bkImage, data);
             Object.assign(this.store.data, data);
             this.store.data.pens = [];
@@ -2388,7 +2398,7 @@ export class Meta2d {
         let req = deepClone(_req);
         if (req.url) {
             if (req.url.indexOf('${') > -1) {
-                let keys = req.url.match(/(?<=\$\{).*?(?=\})/g);
+                let keys = req.url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                 if (keys) {
                     keys.forEach((key) => {
                         req.url = req.url.replace(`\${${key}}`, this.getDynamicParam(key));
@@ -2398,7 +2408,7 @@ export class Meta2d {
             if (typeof req.headers === 'object') {
                 for (let i in req.headers) {
                     if (typeof req.headers[i] === 'string') {
-                        let keys = req.headers[i].match(/(?<=\$\{).*?(?=\})/g);
+                        let keys = req.headers[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                         if (keys) {
                             req.headers[i] = req.headers[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
                         }
@@ -2408,7 +2418,7 @@ export class Meta2d {
             if (typeof req.body === 'object') {
                 for (let i in req.body) {
                     if (typeof req.body[i] === 'string') {
-                        let keys = req.body[i].match(/(?<=\$\{).*?(?=\})/g);
+                        let keys = req.body[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                         if (keys) {
                             req.body[i] = req.body[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
                         }
@@ -2752,6 +2762,16 @@ export class Meta2d {
                         e.pen.calculative.radialGradient = undefined;
                     }
                 }
+                if (e.pen && e.pen.formId) {
+                    const formPen = this.store.pens[e.pen.formId];
+                    if (e.pen.formType === 'submit') {
+                        this.store.data.locked && formPen && !formPen.disabled && this.doEvent(formPen, 'submit');
+                    }
+                    else if (e.pen.formType === 'reset') {
+                        reset(e.pen);
+                        this.store.data.locked && formPen && !formPen.disabled && this.doEvent(formPen, 'reset');
+                    }
+                }
                 e.pen &&
                     e.pen.onClick &&
                     !e.pen.disabled &&
@@ -2798,6 +2818,7 @@ export class Meta2d {
                     this.doEvent(e.pen, eventName);
                 break;
             case 'valueUpdate':
+                e && updateFormData(e, e.formValue);
                 this.store.data.locked && this.doEvent(e, eventName);
                 this.canvas.tooltip.updateText(e);
                 break;
@@ -2821,6 +2842,7 @@ export class Meta2d {
                     this.doEvent(e, eventName);
                 break;
             case 'change':
+                e.pen && updateFormData(e.pen);
                 this.store.data.locked &&
                     e &&
                     !e.disabled &&
@@ -5183,6 +5205,7 @@ export class Meta2d {
         this.closeSocket();
         this.closeNetwork();
         this.closeAll();
+        le5leTheme.destroyThemeSheet(this.store.id);
         this.store.emitter.all.clear(); // 内存释放
         this.canvas.destroy();
         this.canvas = undefined;