Merge branch 'feat-20220705-customTemplate' into 'release'

feat: 新增按钮样式的单选组组件

See merge request !81

src/components/CommonComponents/RadioGroupOfButtonStyle/index.module.css

+.RadiosBox {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border: 1px solid #e6e8eb;
+  border-radius: 4px;
+  background-color: #e6e8eb;
+  cursor: pointer;
+  height: 32px;
+  box-sizing: border-box;
+  padding: 2px;
+}
+.radio {
+  height: 28px;
+  box-sizing: border-box;
+  font-size: 14px;
+  color: #565c66;
+  border-radius: 4px;
+  line-height: 20px;
+  padding: 3px 18px;
+  background-color: #e6e8eb;
+  display: flex;
+  align-items: center;
+}
+.radioActive {
+  color: #1370ff;
+  background-color: #fff;
+  border: 1px solid #e6e8eb;
+}

src/components/CommonComponents/RadioGroupOfButtonStyle/index.tsx

+// 按钮样式的单选组
+import classnames from "classnames";
+import style from "./index.module.css";
+
+type radioOption = {
+  value: string;
+  label: string;
+};
+
+type IRadioGroupOfButtonStyleProps = {
+  radioOptions: Array<radioOption>;
+  value: string;
+  handleRadio: any;
+};
+
+const RadioGroupOfButtonStyle = (props: IRadioGroupOfButtonStyleProps) => {
+  const { radioOptions, value, handleRadio } = props;
+
+  return (
+    <div className={style.RadiosBox}>
+      {radioOptions.map((options) => {
+        return (
+          <div
+            key={options.value}
+            className={classnames({
+              [style.radio]: true,
+              [style.radioActive]: value === options.value,
+            })}
+            onClick={() => handleRadio(options.value)}
+          >
+            {options.label}
+          </div>
+        );
+      })}
+    </div>
+  );
+};
+
+export default RadioGroupOfButtonStyle;

src/views/Project/ProjectSubmitWork/index.tsx

@@ -30,7 +30,6 @@ import MyPopconfirm from "@/components/mui/MyPopconfirm";
 
 import styles from "./index.module.css";
 
-
 const ProjectSubmitWork = () => {
   const Message = useMessage();
   const { currentProjectStore } = useStores();
@@ -68,7 +67,14 @@ const ProjectSubmitWork = () => {
         task.parameters.forEach((parameter) => {
           let value: any = undefined;
           if (parameter.defaultValue) {
-            value = parameter.defaultValue;
+            if (
+              parameter.domType.toLowerCase() === "multipleselect" ||
+              parameter.domType.toLowerCase() === "checkbox"
+            ) {
+              value = parameter.defaultValue.split(",");
+            } else {
+              value = parameter.defaultValue;
+            }
           } else if (
             parameter.domType.toLowerCase() === "multipleselect" ||
             parameter.domType.toLowerCase() === "checkbox"
@@ -193,73 +199,84 @@ const ProjectSubmitWork = () => {
 
   return (
     <div className={styles.swBox}>
-     { fullScreenShow ? null : <div className={styles.swHeader}>
-        <div className={styles.swHeaderLeft}>
-          <MyPopconfirm
-            title="返回后，当前页面已填写内容将不保存，确认返回吗？"
-            onConfirm={handleGoBack}
-          >
-            <IconButton
-              color="primary"
-              // onClick={() => handleGoBack()}
-              aria-label="upload picture"
-              component="span"
-              size="small"
+      {fullScreenShow ? null : (
+        <div className={styles.swHeader}>
+          <div className={styles.swHeaderLeft}>
+            <MyPopconfirm
+              title="返回后，当前页面已填写内容将不保存，确认返回吗？"
+              onConfirm={handleGoBack}
             >
-              <ArrowBackIosNewIcon
-                sx={{
-                  color: "rgba(194, 198, 204, 1)",
-                  width: "12px",
-                  height: "12px",
-                }}
-              />
-            </IconButton>
-          </MyPopconfirm>
+              <IconButton
+                color="primary"
+                // onClick={() => handleGoBack()}
+                aria-label="upload picture"
+                component="span"
+                size="small"
+              >
+                <ArrowBackIosNewIcon
+                  sx={{
+                    color: "rgba(194, 198, 204, 1)",
+                    width: "12px",
+                    height: "12px",
+                  }}
+                />
+              </IconButton>
+            </MyPopconfirm>
 
-          <div className={styles.swTemplateTitle}>
-            {templateConfigInfo?.title}
+            <div className={styles.swTemplateTitle}>
+              {templateConfigInfo?.title}
+            </div>
+            <div className={styles.swTemplateVersionBox}>
+              <span className={styles.swHeaderLable}>版本：</span>
+              <span className={styles.swHeaderValue}>
+                {templateConfigInfo?.languageVersion}
+              </span>
+            </div>
+            <div className={styles.swTemplateUpdateTimeBox}>
+              <span className={styles.swHeaderLable}>更新时间：</span>
+              <span className={styles.swHeaderValue}>
+                {templateConfigInfo?.updateTime
+                  ? moment(templateConfigInfo?.updateTime).format(
+                      "YYYY-MM-DD HH:mm:ss"
+                    )
+                  : "-"}
+              </span>
+            </div>
+            <div className={styles.swHeaderGoback}></div>
           </div>
-          <div className={styles.swTemplateVersionBox}>
-            <span className={styles.swHeaderLable}>版本：</span>
-            <span className={styles.swHeaderValue}>
-              {templateConfigInfo?.languageVersion}
-            </span>
-          </div>
-          <div className={styles.swTemplateUpdateTimeBox}>
-            <span className={styles.swHeaderLable}>更新时间：</span>
-            <span className={styles.swHeaderValue}>
-              {templateConfigInfo?.updateTime
-                ? moment(templateConfigInfo?.updateTime).format(
-                    "YYYY-MM-DD HH:mm:ss"
-                  )
-                : "-"}
-            </span>
+          <div className={styles.swHeaderRight}>
+            <MyPopconfirm
+              title="提交前请先确认参数填写无误，确认提交吗？"
+              onConfirm={handleSubmitForm}
+            >
+              <ButtonComponent
+                text="提交任务"
+                // click={handleSubmitForm}
+              ></ButtonComponent>
+            </MyPopconfirm>
           </div>
-          <div className={styles.swHeaderGoback}></div>
         </div>
-        <div className={styles.swHeaderRight}>
-          <MyPopconfirm
-            title="提交前请先确认参数填写无误，确认提交吗？"
-            onConfirm={handleSubmitForm}
-          >
-            <ButtonComponent
-              text="提交任务"
-              // click={handleSubmitForm}
-            ></ButtonComponent>
-          </MyPopconfirm>
-        </div>
-      </div>}
+      )}
       <div className={styles.swContent}>
-       {fullScreenShow ? null : <div className={styles.swFormBox}>
-          <ConfigForm
-            onRef={configFormRef}
+        {fullScreenShow ? null : (
+          <div className={styles.swFormBox}>
+            <ConfigForm
+              onRef={configFormRef}
+              templateConfigInfo={templateConfigInfo}
+              setParameter={setParameter}
+              setSelectedNodeId={setSelectedNodeId}
+            />
+          </div>
+        )}
+        <div
+          className={styles.swFlowBox}
+          style={fullScreenShow ? { height: "100vh" } : undefined}
+        >
+          <WorkFlow
             templateConfigInfo={templateConfigInfo}
-            setParameter={setParameter}
             setSelectedNodeId={setSelectedNodeId}
+            selectedNodeId={selectedNodeId}
           />
-        </div>}
-        <div className={styles.swFlowBox}  style={fullScreenShow ? { height: "100vh" } : undefined}>
-          <WorkFlow templateConfigInfo={templateConfigInfo} setSelectedNodeId={setSelectedNodeId} selectedNodeId={selectedNodeId}/>
         </div>
       </div>
       <img