Merge branch 'feat-20221012-environment' into 'staging'

feat: 版本提示修改

See merge request !175

public/iconfont/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 3701233 */
-  src: url('iconfont.woff2?t=1665568301019') format('woff2'),
-       url('iconfont.woff?t=1665568301019') format('woff'),
-       url('iconfont.ttf?t=1665568301019') format('truetype');
+  src: url('iconfont.woff2?t=1667357803082') format('woff2'),
+       url('iconfont.woff?t=1667357803082') format('woff'),
+       url('iconfont.ttf?t=1667357803082') format('truetype');
 }
 
 .iconfont {
@@ -13,11 +13,107 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-dianzan:before {
+.icon-bangzhuwendang:before {
+  content: "\e61e";
+}
+
+.icon-tubiaopaixu:before {
+  content: "\e608";
+}
+
+.icon-liebiaopaixu:before {
+  content: "\e609";
+}
+
+.icon-zhanghaoxinxi:before {
+  content: "\e60a";
+}
+
+.icon-xiazai:before {
+  content: "\e60c";
+}
+
+.icon-shaixuan:before {
+  content: "\e60d";
+}
+
+.icon-shangchuanwenjian:before {
+  content: "\e60f";
+}
+
+.icon-zhanghaoanquan:before {
+  content: "\e611";
+}
+
+.icon-shijianicon:before {
+  content: "\e612";
+}
+
+.icon-gailan:before {
+  content: "\e613";
+}
+
+.icon-guanbi:before {
+  content: "\e614";
+}
+
+.icon-tishitubiao:before {
+  content: "\e615";
+}
+
+.icon-gongzuoliumoban:before {
+  content: "\e616";
+}
+
+.icon-shanchu:before {
+  content: "\e617";
+}
+
+.icon-wenjianchuanshu:before {
+  content: "\e618";
+}
+
+.icon-renwuliebiao:before {
+  content: "\e61a";
+}
+
+.icon-gongzuotai:before {
+  content: "\e61b";
+}
+
+.icon-xiangmushezhi:before {
+  content: "\e61c";
+}
+
+.icon-gerenziyuan:before {
+  content: "\e61d";
+}
+
+.icon-shujuguanli:before {
   content: "\e607";
 }
 
-.icon-sousuo-223:before {
-  content: "\e9b2";
+.icon-chakan:before {
+  content: "\e605";
+}
+
+.icon-paixu:before {
+  content: "\e606";
+}
+
+.icon-quanping:before {
+  content: "\e60b";
+}
+
+.icon-sousuo:before {
+  content: "\e60e";
+}
+
+.icon-shuaxin:before {
+  content: "\e610";
+}
+
+.icon-tuichuquanping:before {
+  content: "\e619";
 }
 

public/iconfont/iconfont.json

@@ -6,18 +6,186 @@
   "description": "北鲲云云平台",
   "glyphs": [
     {
-      "icon_id": "32228179",
-      "name": "点赞",
-      "font_class": "dianzan",
+      "icon_id": "32602581",
+      "name": "帮助文档",
+      "font_class": "bangzhuwendang",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "32602444",
+      "name": "图表排序",
+      "font_class": "tubiaopaixu",
+      "unicode": "e608",
+      "unicode_decimal": 58888
+    },
+    {
+      "icon_id": "32602445",
+      "name": "列表排序",
+      "font_class": "liebiaopaixu",
+      "unicode": "e609",
+      "unicode_decimal": 58889
+    },
+    {
+      "icon_id": "32602446",
+      "name": "账号信息",
+      "font_class": "zhanghaoxinxi",
+      "unicode": "e60a",
+      "unicode_decimal": 58890
+    },
+    {
+      "icon_id": "32602447",
+      "name": "下载",
+      "font_class": "xiazai",
+      "unicode": "e60c",
+      "unicode_decimal": 58892
+    },
+    {
+      "icon_id": "32602448",
+      "name": "筛选",
+      "font_class": "shaixuan",
+      "unicode": "e60d",
+      "unicode_decimal": 58893
+    },
+    {
+      "icon_id": "32602449",
+      "name": "上传文件",
+      "font_class": "shangchuanwenjian",
+      "unicode": "e60f",
+      "unicode_decimal": 58895
+    },
+    {
+      "icon_id": "32602450",
+      "name": "账号安全",
+      "font_class": "zhanghaoanquan",
+      "unicode": "e611",
+      "unicode_decimal": 58897
+    },
+    {
+      "icon_id": "32602451",
+      "name": "时间icon",
+      "font_class": "shijianicon",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "32602452",
+      "name": "概览",
+      "font_class": "gailan",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
+    {
+      "icon_id": "32602453",
+      "name": "关闭",
+      "font_class": "guanbi",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "32602454",
+      "name": "提示图标",
+      "font_class": "tishitubiao",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "32602455",
+      "name": "工作流模版",
+      "font_class": "gongzuoliumoban",
+      "unicode": "e616",
+      "unicode_decimal": 58902
+    },
+    {
+      "icon_id": "32602456",
+      "name": "删除",
+      "font_class": "shanchu",
+      "unicode": "e617",
+      "unicode_decimal": 58903
+    },
+    {
+      "icon_id": "32602457",
+      "name": "文件传输",
+      "font_class": "wenjianchuanshu",
+      "unicode": "e618",
+      "unicode_decimal": 58904
+    },
+    {
+      "icon_id": "32602458",
+      "name": "任务列表",
+      "font_class": "renwuliebiao",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
+    {
+      "icon_id": "32602459",
+      "name": "工作台",
+      "font_class": "gongzuotai",
+      "unicode": "e61b",
+      "unicode_decimal": 58907
+    },
+    {
+      "icon_id": "32602460",
+      "name": "项目设置",
+      "font_class": "xiangmushezhi",
+      "unicode": "e61c",
+      "unicode_decimal": 58908
+    },
+    {
+      "icon_id": "32602461",
+      "name": "个人资源",
+      "font_class": "gerenziyuan",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "32601709",
+      "name": "数据管理",
+      "font_class": "shujuguanli",
       "unicode": "e607",
       "unicode_decimal": 58887
     },
     {
-      "icon_id": "28529168",
-      "name": "搜索-223",
-      "font_class": "sousuo-223",
-      "unicode": "e9b2",
-      "unicode_decimal": 59826
+      "icon_id": "32600817",
+      "name": "查看",
+      "font_class": "chakan",
+      "unicode": "e605",
+      "unicode_decimal": 58885
+    },
+    {
+      "icon_id": "32597278",
+      "name": "排序",
+      "font_class": "paixu",
+      "unicode": "e606",
+      "unicode_decimal": 58886
+    },
+    {
+      "icon_id": "32597283",
+      "name": "全屏",
+      "font_class": "quanping",
+      "unicode": "e60b",
+      "unicode_decimal": 58891
+    },
+    {
+      "icon_id": "32597286",
+      "name": "搜索",
+      "font_class": "sousuo",
+      "unicode": "e60e",
+      "unicode_decimal": 58894
+    },
+    {
+      "icon_id": "32597288",
+      "name": "刷新",
+      "font_class": "shuaxin",
+      "unicode": "e610",
+      "unicode_decimal": 58896
+    },
+    {
+      "icon_id": "32597297",
+      "name": "退出全屏",
+      "font_class": "tuichuquanping",
+      "unicode": "e619",
+      "unicode_decimal": 58905
     }
   ]
 }

src/views/ResourceCenter/UserResources/UserResourcesEnvironment/AddEnvironment/index.module.css

@@ -26,7 +26,7 @@
 	margin-bottom: 40px;
 	font-size: 24px;
 	line-height: 32px;
-	font-weight: 550;
+	font-weight: 600;
 }
 .content {
 	display: flex;
@@ -67,12 +67,12 @@
 	overflow: hidden;
 }
 .codeTitle {
-	background-color: rgba(230, 233, 237, 1);
+	background-color: #353942;
 	padding: 11px 20px;
-	color: rgba(30, 38, 51, 1);
+	color: #fff;
 	font-size: 14px;
 	line-height: 22px;
-	font-weight: 550;
+	font-weight: 600;
 	border-top-right-radius: 4px;
 }
 .code {
@@ -95,7 +95,7 @@
 	color: rgba(30, 38, 51, 1);
 	font-size: 14px;
 	line-height: 22px;
-	font-weight: 550;
+	font-weight: 600;
 	margin-bottom: 8px;
 	position: relative;
 }

src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.module.css

@@ -19,6 +19,7 @@
 	position: relative;
 	min-height: 100vh;
 	overflow: overlay;
+	overflow-x: hidden;
 	box-sizing: border-box;
 	display: flex;
 	flex-direction: column;
@@ -28,12 +29,14 @@
 	margin-bottom: 32px;
 	font-size: 24px;
 	line-height: 32px;
-	font-weight: 550;
+	font-weight: 600;
 }
 
 .content {
 	display: flex;
 	position: relative;
+	width: 100%;
+	/* overflow: hidden; */
 	border-radius: 4px;
 	margin-bottom: 20px;
 	height: 562px;
@@ -65,7 +68,20 @@
 	border-bottom-right-radius: 4px;
 }
 .codeTitle {
+	background-color: #353942;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	padding: 11px 20px;
+	color: #fff;
+	font-size: 14px;
+	line-height: 22px;
+	font-weight: 600;
+	border-top-left-radius: 4px;
+}
+.paramsConfigHeader {
 	background-color: rgba(230, 233, 237, 1);
+	border-top-right-radius: 4px;
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -73,8 +89,7 @@
 	color: rgba(30, 38, 51, 1);
 	font-size: 14px;
 	line-height: 22px;
-	font-weight: 550;
-	border-top-right-radius: 4px;
+	font-weight: 600;
 }
 .code {
 	background-color: rgba(247, 248, 250, 1);
@@ -145,3 +160,9 @@
 	word-wrap: break-word;
 	white-space: pre-wrap;
 }
+
+.helpManual {
+	color: #1370ff;
+	cursor: pointer;
+	font-size: 12px;
+}

src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生 15770852798@163.com
  * @Date: 2022-10-18 16:12:55
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-11-01 11:34:04
+ * @LastEditTime: 2022-11-02 13:51:50
  * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -52,14 +52,16 @@ import style from "./index.module.css";
 interface IAddOperator {
 	pageType: string;
 	setPageType: (val: string) => void;
-	detailsId: string;
+	detailsId?: string;
+	detailsMaxVersion?: string;
 	getList: () => void;
 }
 
 type IBuildType = "ENVIRONMENT" | "OPERATOR";
 
 const AddOperator = observer((props: IAddOperator) => {
-	const { pageType, setPageType, detailsId, getList } = props;
+	const { pageType, setPageType, detailsId, detailsMaxVersion, getList } =
+		props;
 	const Message = useMessage();
 
 	/** 创建类型 BATCH - 批算子;  FLOW - 流算子*/
@@ -155,7 +157,7 @@ const AddOperator = observer((props: IAddOperator) => {
 					command: newCommand,
 				} = determineInfo;
 
-				const newVersion = editDefaultVersion(version);
+				const newVersion = editDefaultVersion(detailsMaxVersion || version);
 				/** 设置表单数据 */
 				setFormData({
 					title,
@@ -276,7 +278,7 @@ const AddOperator = observer((props: IAddOperator) => {
 		const resultErrors = checkFormData(
 			formData,
 			batchBuildType,
-			detailInfo?.version || "0.99.99"
+			detailsMaxVersion || "0.99.99"
 		);
 		const paramsResultError = paramsConfigBlur();
 		setFormErrors(resultErrors);
@@ -312,7 +314,6 @@ const AddOperator = observer((props: IAddOperator) => {
 			type: taskType,
 		};
 
-		console.log(operatorList, "operatorList");
 		/** 基于流算子没有应用环境字段 */
 		if (batchBuildType === "OPERATOR") {
 			delete params.envId;
@@ -426,12 +427,16 @@ const AddOperator = observer((props: IAddOperator) => {
 						<FormItemBox
 							label="算子版本"
 							labelClassName={style.labelClassName}
-							className={style.operatorFormItem}
+							className={classNames({
+								[style.operatorFormItem]:
+									!detailsMaxVersion || formErrors?.version,
+							})}
 							itemFlex="column"
 							errorMessage={formErrors?.version || ""}
 							require
 						>
 							<MyInput
+								helperText={formErrors?.version ? "" : detailsMaxVersion}
 								value={formData?.version}
 								onChange={(e) => {
 									changeFormData({ version: e.target.value });
@@ -517,12 +522,22 @@ const AddOperator = observer((props: IAddOperator) => {
 						<div className={style.codeBox}>
 							<div className={style.codeTitle}>
 								<span>参数配置</span>
-								<span
-									onClick={() => setTipsOpen(!tipsOpen)}
-									style={{ color: "#1370FF", cursor: "pointer" }}
-								>
-									帮助手册
-								</span>
+								<div>
+									<span
+										className={classNames({
+											[style.helpManual]: true,
+											iconfont: true,
+											"icon-bangzhuwendang": true,
+										})}
+										style={{ marginRight: "5px", fontSize: "14px" }}
+									></span>
+									<span
+										onClick={() => setTipsOpen(!tipsOpen)}
+										className={style.helpManual}
+									>
+										帮助手册
+									</span>
+								</div>
 							</div>
 							<div className={style.code}>
 								<Code
@@ -586,7 +601,7 @@ const AddOperator = observer((props: IAddOperator) => {
 								[style.helpClose]: !tipsOpen,
 							})}
 						>
-							<div className={style.codeTitle}>
+							<div className={style.paramsConfigHeader}>
 								<span>帮助手册</span>
 								<CloseIcon
 									onClick={() => setTipsOpen(false)}
@@ -617,15 +632,16 @@ const AddOperator = observer((props: IAddOperator) => {
 						className={style.parameterConfigBox}
 						style={{ marginBottom: flowParametersError ? "56px" : "24px" }}
 					>
-						<div className={style.codeTitle}>
+						<div
+							className={style.codeTitle}
+							style={{ borderTopRightRadius: "4px" }}
+						>
 							<span>
 								{batchBuildType === "ENVIRONMENT" ? "运行脚本" : "流程编排"}
 							</span>
 							{batchBuildType === "ENVIRONMENT" ? (
 								<MyTooltip title={scriptHelp}>
-									<span style={{ color: "#1370FF", cursor: "pointer" }}>
-										帮助手册
-									</span>
+									<span className={style.helpManual}>帮助手册</span>
 								</MyTooltip>
 							) : null}
 						</div>

src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/utils.ts

@@ -2,7 +2,7 @@
  * @Author: 吴永生 15770852798@163.com
  * @Date: 2022-10-20 17:36:14
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-11-01 11:05:39
+ * @LastEditTime: 2022-11-02 13:51:42
  * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/utils.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

src/views/ResourceCenter/UserResources/WorkflowOperator/components/OperatorCard/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生 15770852798@163.com
  * @Date: 2022-10-17 14:35:11
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-10-25 21:32:49
+ * @LastEditTime: 2022-11-01 14:45:09
  * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -20,14 +20,24 @@ interface IProps {
 	operatorInfo: IOperatorInfo;
 	setPageType: (val: string) => void;
 	setDetailsId: (val: string) => void;
+	setDetailsMaxVersion: (val: string) => void;
 }
 
 const OperatorCard = observer((props: IProps) => {
 	const navigate = useNavigate();
 	const {
-		operatorInfo: { title = "", type, version, productId, createdTime, id },
+		operatorInfo: {
+			title = "",
+			type,
+			version,
+			productId,
+			createdTime,
+			id,
+			maxVersion = "",
+		},
 		setPageType,
 		setDetailsId,
+		setDetailsMaxVersion,
 	} = props;
 	/** 产品store */
 	const { productListStore } = useStores();
@@ -43,6 +53,7 @@ const OperatorCard = observer((props: IProps) => {
 		if (val === "upgrade") {
 			setPageType("edit");
 			setDetailsId(id || "");
+			setDetailsMaxVersion(maxVersion);
 		}
 	};
 

src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx

@@ -2,7 +2,7 @@
  * @Author: 吴永生 15770852798@163.com
  * @Date: 2022-10-17 14:35:11
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-10-27 10:10:08
+ * @LastEditTime: 2022-11-01 14:49:40
  * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -38,7 +38,10 @@ const WorkflowOperator = observer(() => {
 		type: "all",
 	});
 
+	/** 详情ID */
 	const [detailsId, setDetailsId] = useState<string>("");
+	/** 详情最大版本 */
+	const [detailsMaxVersion, setDetailsMaxVersion] = useState<string>("");
 
 	const [list, setList] = useState<IOperatorInfo[]>();
 
@@ -124,6 +127,7 @@ const WorkflowOperator = observer(() => {
 						onClick={() => {
 							setPageType("add");
 							setDetailsId("");
+							setDetailsMaxVersion("");
 						}}
 					></MyButton>
 				</div>
@@ -135,6 +139,7 @@ const WorkflowOperator = observer(() => {
 								renderItem={(item: any) => (
 									<OperatorCard
 										setDetailsId={setDetailsId}
+										setDetailsMaxVersion={setDetailsMaxVersion}
 										operatorInfo={item}
 										setPageType={setPageType}
 									/>
@@ -153,6 +158,7 @@ const WorkflowOperator = observer(() => {
 				<AddOperator
 					getList={newGetList}
 					detailsId={detailsId}
+					detailsMaxVersion={detailsMaxVersion}
 					setPageType={setPageType}
 					pageType={pageType}
 				/>

src/views/ResourceCenter/UserResources/WorkflowOperator/interface.ts

@@ -2,7 +2,7 @@
  * @Author: 吴永生 15770852798@163.com
  * @Date: 2022-10-19 20:50:18
  * @LastEditors: 吴永生 15770852798@163.com
- * @LastEditTime: 2022-10-27 17:14:29
+ * @LastEditTime: 2022-11-01 14:45:41
  * @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/interface.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,6 +17,7 @@ export interface IOperatorInfo{
   version: string;   
   productId: string; 
   createdTime: string;
+  maxVersion: string
 }
 
 export enum operatorType {