Merge branch 'feat-20220801' into 'release'

fix: 按钮去除阴影

See merge request !62

src/components/mui/MyButton.tsx

@@ -47,6 +47,7 @@ const theme = createTheme({
 			styleOverrides: {
 				root: {
 					minWidth: "48px",
+					boxShadow: "none !important",
 					"&.MuiButton-textError": {
 						color: "rgba(255, 78, 78, 1)",
 					},
@@ -67,7 +68,6 @@ const theme = createTheme({
 				outlined: {
 					backgroundColor: "#FFFFFF",
 					border: "1px solid #1370FF",
-					boxShadow: "none !important",
 					color: "#1370FF",
 					"&:hover": { backgroundColor: "#ECF4FF " },
 					"&.MuiButton-textError": {
@@ -76,7 +76,6 @@ const theme = createTheme({
 				},
 				text: {
 					backgroundColor: "transparent",
-					boxShadow: "none !important",
 					color: "#1370FF",
 					"&:hover": { backgroundColor: "#ECF4FF " },
 				},
@@ -95,7 +94,6 @@ const theme = createTheme({
 				},
 				outlinedSecondary: {
 					border: "1px solid rgba(221, 225, 230, 1)",
-					boxShadow: "none !important",
 					color: "rgba(30, 38, 51, 1)",
 					"&:hover": {
 						backgroundColor: "rgba(240, 242, 245, 1) ",
@@ -104,7 +102,6 @@ const theme = createTheme({
 				},
 				textSecondary: {
 					backgroundColor: "transparent",
-					boxShadow: "none !important",
 					color: "#FF4E4E",
 					"&:hover": { backgroundColor: "#FFEDED " },
 				},

src/views/CustomOperator/components/SaveOperator/index.tsx

@@ -193,8 +193,8 @@ const SaveOperator = (props: IProps) => {
 					<MyInput
 						value={description}
 						id="desc"
-						label="模板描述"
-						placeholder="模板描述"
+						label="算子描述"
+						placeholder="算子描述"
 						onChange={handleDescriptionChange}
 						multiline
 						rows={4}

src/views/Project/ProjectWorkbench/workbenchTemplate/components/AddTemplate/index.tsx

@@ -215,7 +215,7 @@ const AddTemplate = (props: IAddTemplateProps) => {
 					<Typography
 						sx={{ fontSize: "18px", fontWeight: "600", color: "#1E2633" }}
 					>
-						添加工作流模版
+						管理工作流模板
 					</Typography>
 					<Box
 						sx={{

src/views/Project/ProjectWorkbench/workbenchTemplate/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生#A02208 yongsheng.wu@wholion.com
  * @Date: 2022-05-31 10:18:13
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-08-09 16:32:42
+ * @LastEditTime: 2022-08-18 10:01:36
  * @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -114,7 +114,7 @@ const ProjectMembers = observer(() => {
 				<SearchInput onKeyUp={handleKeyWordChangeKeyUp} sx={{ width: 340 }} />
 				{isPass("PROJECT_WORKBENCH_FLOES_ADD", "MANAGER") && (
 					<MyButton
-						text={"添加工作流模版"}
+						text={"管理工作流模板"}
 						img={<Add />}
 						onClick={addTemplateBlock}
 						size={"medium"}

src/views/Project/components/Flow/components/BatchOperatorFlow/index.tsx

@@ -147,6 +147,7 @@ const BatchOperatorFlow = (props: IProps) => {
 							flowNodeStyle: {
 								backgroundColor: "#fff",
 								borderRadius: "4px",
+								boxShadow: "0px 3px 10px 0px rgba(0,24,57,0.14)",
 							},
 							inStyle: {
 								backgroundColor: "rgba(19, 112, 255, 1)",