diff --git a/src/api/http.ts b/src/api/http.ts index a7d8a130..0588049d 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -172,7 +172,9 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req case RequestBodyEnum.JSON: headers['Content-Type'] = ContentTypeEnum.JSON - data = translateStr(JSON.parse(targetRequestParams.Body['json'])) + //json对象也能使用'javasctipt:'来动态拼接参数 + data = translateStr(targetRequestParams.Body['json']) + if(typeof data === 'string') data = JSON.parse(data) // json 赋值给 data break diff --git a/src/assets/images/chart/informations/photo_carousel.png b/src/assets/images/chart/informations/photo_carousel.png new file mode 100644 index 00000000..55cde626 Binary files /dev/null and b/src/assets/images/chart/informations/photo_carousel.png differ diff --git a/src/enums/editPageEnum.ts b/src/enums/editPageEnum.ts index 07d51e70..518b6f70 100644 --- a/src/enums/editPageEnum.ts +++ b/src/enums/editPageEnum.ts @@ -12,7 +12,8 @@ export enum DragKeyEnum { // 不同页面保存操作 export enum SavePageEnum { CHART = 'SaveChart', - JSON = 'SaveJSON' + JSON = 'SaveJSON', + CLOSE = 'close' } // 操作枚举 diff --git a/src/enums/eventEnum.ts b/src/enums/eventEnum.ts index a8110a71..9f05aa57 100644 --- a/src/enums/eventEnum.ts +++ b/src/enums/eventEnum.ts @@ -7,15 +7,15 @@ export enum BaseEvent { // 移入 ON_MOUSE_ENTER = 'mouseenter', // 移出 - ON_MOUSE_LEAVE = 'mouseleave', + ON_MOUSE_LEAVE = 'mouseleave' } // vue3 生命周期事件 -export enum EventLife { +export enum EventLife { // 渲染之后 VNODE_MOUNTED = 'vnodeMounted', // 渲染之前 - VNODE_BEFORE_MOUNT = 'vnodeBeforeMount', + VNODE_BEFORE_MOUNT = 'vnodeBeforeMount' } // 内置字符串函数对象列表 @@ -28,4 +28,9 @@ export const excludeParseEventKeyList = [ BaseEvent.ON_MOUSE_LEAVE, //过滤器 'filter' -] \ No newline at end of file +] +// 内置字符串函数键值列表 +export const excludeParseEventValueList = [ + // 请求里的函数语句 + 'javascript:' +] diff --git a/src/layout/components/LayoutHeader/index.vue b/src/layout/components/LayoutHeader/index.vue index 91c80823..718a9282 100644 --- a/src/layout/components/LayoutHeader/index.vue +++ b/src/layout/components/LayoutHeader/index.vue @@ -29,7 +29,7 @@ import { ThemeColorSelect } from '@/components/Pages/ThemeColorSelect'