Merge remote-tracking branch 'upstream/dev' into dev

SoarBlueSky · SoarBlueSky · commit fd6ba60aacd0 · 2022-03-07T19:08:23.000+08:00
diff --git a/core/src/main/java/datart/core/common/RequestContext.java b/core/src/main/java/datart/core/common/RequestContext.java
@@ -49,7 +49,7 @@ public static void clean() {
     }
 
     public static void setSql(String sqlStr) {
-        if (scriptPermission.get()) {
+        if (scriptPermission.get() != null && scriptPermission.get()) {
             sql.set(sqlStr);
         }
     }
diff --git a/frontend/src/app/assets/images/grid.svg b/frontend/src/app/assets/images/grid.svg
@@ -1 +1 @@
-<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><defs><pattern id="grid" width="40" height="40" patternUnits="userSpaceOnUse"><path d="M 0 10 L 40 10 M 10 0 L 10 40 M 0 20 L 40 20 M 20 0 L 20 40 M 0 30 L 40 30 M 30 0 L 30 40" fill="none" stroke="#d0d0d0" opacity="0.2" stroke-width="1"/><path d="M 40 0 L 0 0 0 40" fill="none" stroke="#d0d0d0" stroke-width="1"/></pattern></defs><rect width="100%" height="100%" fill="url(#grid)"/></svg>
+<svg width="40" height="40" xmlns="http://www.w3.org/2000/svg"><defs><pattern id="grid" width="40" height="40" patternUnits="userSpaceOnUse"><path d="M 0 10 L 40 10 M 10 0 L 10 40 M 0 20 L 40 20 M 20 0 L 20 40 M 0 30 L 40 30 M 30 0 L 30 40" fill="none" stroke="#6c757d" opacity="0.2" stroke-width="0.3"/><path d="M 40 0 L 0 0 0 40" fill="none" stroke="#6c757d" opacity="0.7" stroke-width="0.4"/></pattern></defs><rect width="100%" height="100%" fill="url(#grid)"/></svg>
diff --git a/frontend/src/app/components/ChartGraph/BasicRichText/config.ts b/frontend/src/app/components/ChartGraph/BasicRichText/config.ts
@@ -65,7 +65,7 @@ const config: ChartConfig = {
           label: 'delta.richText',
           key: 'richText',
           default: '',
-          comType: 'text',
+          comType: 'input',
         },
       ],
     },
diff --git a/frontend/src/app/pages/DashBoardPage/hooks/useSlideStyle.ts b/frontend/src/app/pages/DashBoardPage/hooks/useSlideStyle.ts
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import gridSvg from 'assets/svgs/grid.svg';
+import gridSvg from 'app/assets/images/grid.svg';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 function useSlideStyle(
   autoFit: boolean | undefined,
diff --git a/frontend/src/assets/svgs/mention.svg b/frontend/src/assets/svgs/mention.svg

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public static void clean() {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public static void setSql(String sqlStr) {`
`52`		`- if (scriptPermission.get()) {`
	`52`	`+ if (scriptPermission.get() != null && scriptPermission.get()) {`
`53`	`53`	`sql.set(sqlStr);`
`54`	`54`	`}`
`55`	`55`	`}`