diff --git a/k8s/k8s-10gen.yaml b/k8s/k8s-10gen.yaml
deleted file mode 100644
index aaec3d8a..00000000
--- a/k8s/k8s-10gen.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-gen-deployment
- namespace: ci4s-test
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-gen
- template:
- metadata:
- labels:
- app: ci4s-gen
- spec:
- containers:
- - name: ci4s-gen
- image: ci4s-gen:v1.0
- ports:
- - containerPort: 9202
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-gen-service
- namespace: ci4s-test
-spec:
- type: NodePort
- ports:
- - port: 9202
- nodePort: 31211
- protocol: TCP
- selector:
- app: ci4s-gen
-
diff --git a/k8s/k8s-11visual.yaml b/k8s/k8s-11visual.yaml
deleted file mode 100644
index 3c2b25fb..00000000
--- a/k8s/k8s-11visual.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-visual-deployment
- namespace: ci4s-test
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-visual
- template:
- metadata:
- labels:
- app: ci4s-visual
- spec:
- containers:
- - name: ci4s-visual
- image: ci4s-visual:v1.0
- ports:
- - containerPort: 9100
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-visual-service
- namespace: ci4s-test
-spec:
- type: NodePort
- ports:
- - port: 9100
- nodePort: 31212
- protocol: TCP
- selector:
- app: ci4s-visual
-
diff --git a/k8s/k8s-12front.yaml b/k8s/k8s-12front.yaml
deleted file mode 100644
index fb24fc2d..00000000
--- a/k8s/k8s-12front.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-front-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-front
- template:
- metadata:
- labels:
- app: ci4s-front
- spec:
- containers:
- - name: ci4s-front
- image: 172.20.32.187/ci4s/ci4s-front:20240401
- ports:
- - containerPort: 8000
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-front-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 8000
- nodePort: 31213
- protocol: TCP
- selector:
- app: ci4s-front
-
diff --git a/k8s/k8s-3nacos.yaml b/k8s/k8s-3nacos.yaml
deleted file mode 100644
index 0c293016..00000000
--- a/k8s/k8s-3nacos.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- namespace: argo
- name: nacos-ci4s
- labels:
- app: nacos-ci4s
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: nacos-ci4s
- template:
- metadata:
- labels:
- app: nacos-ci4s
- spec:
- containers:
- - name: nacos-ci4s
- image: nacos/nacos-server:v2.2.0
- env:
- - name: SPRING_DATASOURCE_PLATFORM
- value: mysql
- - name: MODE
- value: standalone
- - name: MYSQL_SERVICE_HOST
- value: mysql.argo.svc
- - name: MYSQL_SERVICE_PORT
- value: "3306"
- - name: MYSQL_SERVICE_DB_NAME
- value: nacos-ci4s-config
- - name: MYSQL_SERVICE_USER
- value: root
- - name: MYSQL_SERVICE_PASSWORD
- value: qazxc123456.
- ports:
- - containerPort: 8848
- - containerPort: 9848
- restartPolicy: Always
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
- namespace: argo
- name: nacos-ci4s
- labels:
- app: nacos-ci4s
-spec:
- type: NodePort
- selector:
- app: nacos-ci4s
- ports:
- - port: 8848
- targetPort: 8848
- nodePort: 31203
- name: web
- - port: 9848
- targetPort: 9848
- nodePort: 31204
- name: podsa
diff --git a/k8s/k8s-4gateway.yaml b/k8s/k8s-4gateway.yaml
deleted file mode 100644
index b0cf7991..00000000
--- a/k8s/k8s-4gateway.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-gateway-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-gateway
- template:
- metadata:
- labels:
- app: ci4s-gateway
- spec:
- containers:
- - name: ci4s-gateway
- image: 172.20.32.187/ci4s/ci4s-gateway:20240401
- ports:
- - containerPort: 8082
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-gateway-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 8082
- nodePort: 31205
- protocol: TCP
- selector:
- app: ci4s-gateway
-
diff --git a/k8s/k8s-5auth.yaml b/k8s/k8s-5auth.yaml
deleted file mode 100644
index 2066bd5d..00000000
--- a/k8s/k8s-5auth.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-auth-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-auth
- template:
- metadata:
- labels:
- app: ci4s-auth
- spec:
- containers:
- - name: ci4s-auth
- image: 172.20.32.187/ci4s/ci4s-auth:20240401
- ports:
- - containerPort: 9200
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-auth-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 9200
- nodePort: 31206
- protocol: TCP
- selector:
- app: ci4s-auth
-
diff --git a/k8s/k8s-6system.yaml b/k8s/k8s-6system.yaml
deleted file mode 100644
index 8c6830bf..00000000
--- a/k8s/k8s-6system.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-system-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-system
- template:
- metadata:
- labels:
- app: ci4s-system
- spec:
- containers:
- - name: ci4s-system
- image: 172.20.32.187/ci4s/ci4s-system:20240401
- ports:
- - containerPort: 9201
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-system-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 9201
- nodePort: 31207
- protocol: TCP
- selector:
- app: ci4s-system
-
diff --git a/k8s/k8s-7management.yaml b/k8s/k8s-7management.yaml
deleted file mode 100644
index cb07a130..00000000
--- a/k8s/k8s-7management.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-management-platform-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-management-platform
- template:
- metadata:
- labels:
- app: ci4s-management-platform
- spec:
- containers:
- - name: ci4s-management-platform
- image: 172.20.32.187/ci4s/managent:20240401
- ports:
- - containerPort: 9213
- volumeMounts:
- - name: resource
- mountPath: /home/resource/
- volumes:
- - name: resource
- hostPath:
- path: /home/resource/
- type: DirectoryOrCreate
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-management-platform-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 9213
- nodePort: 31208
- protocol: TCP
- selector:
- app: ci4s-management-platform
-
diff --git a/k8s/k8s-8file.yaml b/k8s/k8s-8file.yaml
deleted file mode 100644
index 3f54b8d0..00000000
--- a/k8s/k8s-8file.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-file-deployment
- namespace: ci4s-test
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-file
- template:
- metadata:
- labels:
- app: ci4s-file
- spec:
- containers:
- - name: ci4s-file
- image: ci4s-file:v1.0
- ports:
- - containerPort: 9300
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-file-service
- namespace: ci4s-test
-spec:
- type: NodePort
- ports:
- - port: 9300
- nodePort: 31209
- protocol: TCP
- selector:
- app: ci4s-file
-
diff --git a/k8s/k8s-9job.yaml b/k8s/k8s-9job.yaml
deleted file mode 100644
index b52cb355..00000000
--- a/k8s/k8s-9job.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-job-deployment
- namespace: ci4s-test
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-job
- template:
- metadata:
- labels:
- app: ci4s-job
- spec:
- containers:
- - name: ci4s-job
- image: ci4s-job:v1.0
- ports:
- - containerPort: 9203
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-job-service
- namespace: ci4s-test
-spec:
- type: NodePort
- ports:
- - port: 9203
- nodePort: 31210
- protocol: TCP
- selector:
- app: ci4s-job
-
diff --git a/k8s/template-yaml/deploy/k8s-12front.yaml b/k8s/template-yaml/deploy/k8s-12front.yaml
deleted file mode 100644
index 565b12ec..00000000
--- a/k8s/template-yaml/deploy/k8s-12front.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-front-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-front
- template:
- metadata:
- labels:
- app: ci4s-front
- spec:
- containers:
- - name: ci4s-front
- image: 172.20.32.187/ci4s/ci4s-front:202406120836
- ports:
- - containerPort: 8000
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-front-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - port: 8000
- nodePort: 31213
- protocol: TCP
- selector:
- app: ci4s-front
-
diff --git a/k8s/template-yaml/deploy/k8s-7management.yaml b/k8s/template-yaml/deploy/k8s-7management.yaml
deleted file mode 100644
index 75f1b522..00000000
--- a/k8s/template-yaml/deploy/k8s-7management.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: ci4s-management-platform-deployment
- namespace: argo
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: ci4s-management-platform
- template:
- metadata:
- labels:
- app: ci4s-management-platform
- spec:
- containers:
- - name: ci4s-management-platform
- image: 172.20.32.187/ci4s/ci4s-managent:202409201355
- env:
- - name: TZ
- value: Asia/Shanghai
- - name: JAVA_TOOL_OPTIONS
- value: "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5005"
- ports:
- - containerPort: 9213
- volumeMounts:
- - name: resource-volume
- mountPath: /home/resource/
- volumes:
- - name: resource-volume
- persistentVolumeClaim:
- claimName: platform-data-pvc-nfs
----
-apiVersion: v1
-kind: Service
-metadata:
- name: ci4s-management-platform-service
- namespace: argo
-spec:
- type: NodePort
- ports:
- - name: http
- port: 9213
- nodePort: 31208
- protocol: TCP
- - name: debug
- nodePort: 34567
- port: 5005
- protocol: TCP
- targetPort: 5005
- selector:
- app: ci4s-management-platform
-
diff --git a/react-ui/.storybook/main.ts b/react-ui/.storybook/main.ts
index 820a0eeb..54824837 100644
--- a/react-ui/.storybook/main.ts
+++ b/react-ui/.storybook/main.ts
@@ -16,7 +16,7 @@ const config: StorybookConfig = {
name: '@storybook/react-webpack5',
options: {},
},
- staticDirs: ['../public'],
+ staticDirs: ['../static'],
docs: {
defaultName: 'Documentation',
},
diff --git a/react-ui/.storybook/tsconfig.json b/react-ui/.storybook/tsconfig.json
index 601d7708..e30a508b 100644
--- a/react-ui/.storybook/tsconfig.json
+++ b/react-ui/.storybook/tsconfig.json
@@ -21,6 +21,7 @@
"incremental": true, // 通过读写磁盘上的文件来启用增量编译
"noFallthroughCasesInSwitch": true, // 报告switch语句中的fallthrough案例错误
"strictNullChecks": true, // 启用严格的null检查
+ "importHelpers": true,
"baseUrl": "./"
}
}
diff --git a/react-ui/package.json b/react-ui/package.json
index 2b2cfd4b..56a4b735 100644
--- a/react-ui/package.json
+++ b/react-ui/package.json
@@ -166,7 +166,7 @@
},
"msw": {
"workerDirectory": [
- "public"
+ "static"
]
}
}
diff --git a/react-ui/src/components/BasicTableInfo/index.less b/react-ui/src/components/BasicTableInfo/index.less
index 479fe332..1207d033 100644
--- a/react-ui/src/components/BasicTableInfo/index.less
+++ b/react-ui/src/components/BasicTableInfo/index.less
@@ -4,7 +4,7 @@
flex-wrap: wrap;
align-items: stretch;
width: 100%;
- border: 1px solid @border-color-base;
+ border: 1px solid @border-color;
border-bottom: none;
border-radius: 4px;
@@ -12,7 +12,7 @@
display: flex;
align-items: stretch;
width: 25%;
- border-bottom: 1px solid @border-color-base;
+ border-bottom: 1px solid @border-color;
&__label {
flex: none;
diff --git a/react-ui/src/components/DisabledInput/index.tsx b/react-ui/src/components/DisabledInput/index.tsx
deleted file mode 100644
index 3a31def8..00000000
--- a/react-ui/src/components/DisabledInput/index.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Typography } from 'antd';
-import styles from './index.less';
-
-type DisabledInputProps = {
- value?: any;
- valuePropName?: string;
-};
-
-/**
- * 模拟禁用的输入框,但是完全显示内容
- */
-function DisabledInput({ value, valuePropName }: DisabledInputProps) {
- const data = valuePropName ? value[valuePropName] : value;
- return (
-
- {data}
-
- );
-}
-
-export default DisabledInput;
diff --git a/react-ui/src/components/DisabledInput/index.less b/react-ui/src/components/FormInfo/index.less
similarity index 55%
rename from react-ui/src/components/DisabledInput/index.less
rename to react-ui/src/components/FormInfo/index.less
index 06808c5a..868404c7 100644
--- a/react-ui/src/components/DisabledInput/index.less
+++ b/react-ui/src/components/FormInfo/index.less
@@ -1,4 +1,5 @@
-.disabled-input {
+.form-info {
+ min-height: 32px;
padding: 4px 11px;
color: @text-disabled-color;
font-size: @font-size-input;
@@ -6,4 +7,14 @@
border: 1px solid #d9d9d9;
border-radius: 6px;
cursor: not-allowed;
+
+ .ant-typography {
+ margin: 0 !important;
+ }
+}
+
+.form-info--multiline {
+ .ant-typography {
+ white-space: pre-wrap;
+ }
}
diff --git a/react-ui/src/components/FormInfo/index.tsx b/react-ui/src/components/FormInfo/index.tsx
new file mode 100644
index 00000000..a784e433
--- /dev/null
+++ b/react-ui/src/components/FormInfo/index.tsx
@@ -0,0 +1,41 @@
+import { Typography } from 'antd';
+import classNames from 'classnames';
+import './index.less';
+
+type FormInfoProps = {
+ /** 自定义类名 */
+ value?: any;
+ /** 如果 `value` 是对象时,取对象的哪个属性作为值 */
+ valuePropName?: string;
+ /** 是否是多行 */
+ multiline?: boolean;
+ /** 自定义类名 */
+ className?: string;
+ /** 自定义样式 */
+ style?: React.CSSProperties;
+};
+
+/**
+ * 模拟禁用的输入框,但是内容超长时,hover 时显示所有内容
+ */
+function FormInfo({ value, valuePropName, className, style, multiline = false }: FormInfoProps) {
+ const data = value && typeof value === 'object' && valuePropName ? value[valuePropName] : value;
+ return (
+
+
+ {data}
+
+
+ );
+}
+
+export default FormInfo;
diff --git a/react-ui/src/components/InfoGroup/index.less b/react-ui/src/components/InfoGroup/index.less
index 4dccf4c7..94c56187 100644
--- a/react-ui/src/components/InfoGroup/index.less
+++ b/react-ui/src/components/InfoGroup/index.less
@@ -4,7 +4,7 @@
&__content {
padding: 20px @content-padding;
background-color: white;
- border: 1px solid @border-color-base;
+ border: 1px solid @border-color;
border-top: none;
border-radius: 0 0 4px 4px;
}
diff --git a/react-ui/src/components/ResourceSelectorModal/index.less b/react-ui/src/components/ResourceSelectorModal/index.less
index cffe4caf..1581e510 100644
--- a/react-ui/src/components/ResourceSelectorModal/index.less
+++ b/react-ui/src/components/ResourceSelectorModal/index.less
@@ -22,8 +22,8 @@
height: 398px;
margin-right: 15px;
padding: 15px;
- background-color: @background-color-primary;
- border: 1px solid @border-color;
+ background-color: rgba(22, 100, 255, 0.03);
+ border: 1px solid rgba(22, 100, 255, 0.3);
border-radius: 8px;
&__search {
@@ -31,7 +31,7 @@
padding-left: 0;
background-color: transparent;
border-width: 0;
- border-bottom: 1px solid @border-color-secondary;
+ border-bottom: 1px solid rgba(22, 100, 255, 0.1);
border-radius: 0;
}
@@ -45,8 +45,8 @@
width: calc(100% - 488px - 15px);
height: 398px;
padding: 15px;
- background-color: @background-color-primary;
- border: 1px solid @border-color;
+ background-color: rgba(22, 100, 255, 0.03);
+ border: 1px solid rgba(22, 100, 255, 0.3);
border-radius: 8px;
&__title {
@@ -56,7 +56,7 @@
color: @text-color;
font-size: @font-size;
line-height: 46px;
- border-bottom: 1px solid @border-color-secondary;
+ border-bottom: 1px solid rgba(22, 100, 255, 0.1);
}
&__files {
height: calc(100% - 75px);
@@ -68,7 +68,7 @@
color: @text-color-secondary;
font-size: 13px;
word-break: break-all;
- background: @background-color-gray;
+ background: rgba(4, 3, 3, 0.06);
border-radius: 4px;
}
}
diff --git a/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx b/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx
index ea319dc8..ab713f48 100644
--- a/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx
+++ b/react-ui/src/pages/AutoML/components/ExperimentInstance/index.tsx
@@ -107,7 +107,7 @@ function ExperimentInstanceComponent({
};
if (!experimentInsList || experimentInsList.length === 0) {
- return null;
+ return 暂无实验实例
;
}
return (
diff --git a/react-ui/src/pages/Experiment/Comparison/index.less b/react-ui/src/pages/Experiment/Comparison/index.less
index 3be69ed9..4dce8268 100644
--- a/react-ui/src/pages/Experiment/Comparison/index.less
+++ b/react-ui/src/pages/Experiment/Comparison/index.less
@@ -29,7 +29,7 @@
div {
flex: 1;
height: 1px;
- background-color: @border-color-base;
+ background-color: @border-color;
}
p {
@@ -45,7 +45,7 @@
.ant-table-thead {
.ant-table-cell {
background-color: rgb(247, 247, 247);
- border-color: @border-color-base !important;
+ border-color: @border-color !important;
}
}
.ant-table-tbody {
diff --git a/react-ui/src/pages/Experiment/components/ExperimentInstance/index.tsx b/react-ui/src/pages/Experiment/components/ExperimentInstance/index.tsx
index 4d68d93c..9b37dba8 100644
--- a/react-ui/src/pages/Experiment/components/ExperimentInstance/index.tsx
+++ b/react-ui/src/pages/Experiment/components/ExperimentInstance/index.tsx
@@ -20,7 +20,7 @@ import TensorBoardStatusCell from '../TensorBoardStatus';
import styles from './index.less';
type ExperimentInstanceProps = {
- experimentInList?: ExperimentInstance[];
+ experimentInsList?: ExperimentInstance[];
experimentInsTotal: number;
onClickInstance?: (instance: ExperimentInstance) => void;
onClickTensorBoard?: (instance: ExperimentInstance) => void;
@@ -30,7 +30,7 @@ type ExperimentInstanceProps = {
};
function ExperimentInstanceComponent({
- experimentInList,
+ experimentInsList,
experimentInsTotal,
onClickInstance,
onClickTensorBoard,
@@ -40,8 +40,8 @@ function ExperimentInstanceComponent({
}: ExperimentInstanceProps) {
const { message } = App.useApp();
const allIntanceIds = useMemo(() => {
- return experimentInList?.map((item) => item.id) || [];
- }, [experimentInList]);
+ return experimentInsList?.map((item) => item.id) || [];
+ }, [experimentInsList]);
const [
selectedIns,
setSelectedIns,
@@ -57,7 +57,7 @@ function ExperimentInstanceComponent({
if (allIntanceIds.length === 0) {
setSelectedIns([]);
}
- }, [experimentInList]);
+ }, [experimentInsList]);
// 删除实验实例确认
const handleRemove = (instance: ExperimentInstance) => {
@@ -118,8 +118,8 @@ function ExperimentInstanceComponent({
}
};
- if (!experimentInList || experimentInList.length === 0) {
- return null;
+ if (!experimentInsList || experimentInsList.length === 0) {
+ return 暂无数据
;
}
return (
@@ -152,7 +152,7 @@ function ExperimentInstanceComponent({
- {experimentInList.map((item, index) => (
+ {experimentInsList.map((item, index) => (
))}
- {experimentInsTotal > experimentInList.length ? (
+ {experimentInsTotal > experimentInsList.length ? (