Commit a8b40bbf authored by chenshouchao's avatar chenshouchao

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

Feat 20221012 environment

See merge request !166
parents 1154b659 17d79205
.environment { .environment {
padding: 19px 24px 0; padding: 20px 24px 0;
} }
.top { .top {
display: flex; display: flex;
......
...@@ -210,7 +210,7 @@ const UserResourcesEnvironment = () => { ...@@ -210,7 +210,7 @@ const UserResourcesEnvironment = () => {
<MySelect <MySelect
options={[ options={[
{ {
label: "全部", label: "全部环境",
value: "ALL", value: "ALL",
}, },
{ {
......
.template { .template {
padding: 19px 24px 0; padding: 20px 24px 0;
} }
.top { .top {
display: flex; display: flex;
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
height: 208px; height: 208px;
box-sizing: border-box; box-sizing: border-box;
padding: 16px 20px; padding: 16px 20px;
transition: box-shadow 0.2s cubic-bezier(0, 0, 1, 1);
}
.templateBox:hover {
box-shadow: 0px 6px 24px 0px rgb(3 47 105 / 14%);
} }
.templateTop { .templateTop {
display: flex; display: flex;
...@@ -46,7 +50,7 @@ ...@@ -46,7 +50,7 @@
height: 24px; height: 24px;
} }
.templateTitle { .templateTitle {
font-size: 14px; font-size: 15px;
line-height: 22px; line-height: 22px;
color: rgba(30, 38, 51, 1); color: rgba(30, 38, 51, 1);
margin-left: 8px; margin-left: 8px;
......
...@@ -26,7 +26,7 @@ const UserResourcesTemplate = observer(() => { ...@@ -26,7 +26,7 @@ const UserResourcesTemplate = observer(() => {
const [showDeleteDialog, setShowDeleteDialog] = useState(false); const [showDeleteDialog, setShowDeleteDialog] = useState(false);
const [showDetail, setShowDetail] = useState(false); // 详情 const [showDetail, setShowDetail] = useState(false); // 详情
const [templateId, setTemplateId] = useState(""); const [templateId, setTemplateId] = useState("");
const [product, setProduct] = useState(""); // 搜索列表用 const [product, setProduct] = useState("all"); // 搜索列表用
const [productId, setProductId] = useState(""); // 新增模板用 const [productId, setProductId] = useState(""); // 新增模板用
const [list, setList] = useState([]); const [list, setList] = useState([]);
const { productListStore } = useStores(); const { productListStore } = useStores();
...@@ -143,7 +143,7 @@ const UserResourcesTemplate = observer(() => { ...@@ -143,7 +143,7 @@ const UserResourcesTemplate = observer(() => {
<MySelect <MySelect
options={ options={
[ [
{ label: "全部", value: "all" }, { label: "全部产品", value: "all" },
...productListStore?.productList, ...productListStore?.productList,
] || [] ] || []
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴永生 15770852798@163.com * @Author: 吴永生 15770852798@163.com
* @Date: 2022-10-18 16:12:55 * @Date: 2022-10-18 16:12:55
* @LastEditors: 吴永生 15770852798@163.com * @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-10-28 16:48:21 * @LastEditTime: 2022-10-31 09:38:48
* @FilePath: /bkunyun/src/views/ResourceCenter/UserResources/WorkflowOperator/components/AddOperator/index.tsx * @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 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/ */
...@@ -348,7 +348,7 @@ const AddOperator = observer((props: IAddOperator) => { ...@@ -348,7 +348,7 @@ const AddOperator = observer((props: IAddOperator) => {
try { try {
const newData = JSON.parse(code); const newData = JSON.parse(code);
const nameArr = newData?.map((item: any) => { const nameArr = newData?.map((item: any) => {
return `${item.name}: ~{$actorName$.${item.name}}`; return `${item.title}: ~{$actorName$.${item.name}}`;
}); });
newText = nameArr?.join("\n"); newText = nameArr?.join("\n");
} catch (err) { } catch (err) {
...@@ -585,7 +585,7 @@ const AddOperator = observer((props: IAddOperator) => { ...@@ -585,7 +585,7 @@ const AddOperator = observer((props: IAddOperator) => {
</FormItemBox> </FormItemBox>
</div> </div>
)} )}
<div></div> {/* <div style={{ width: "368px", backgroundColor: "red" }}></div> */}
</div> </div>
{taskType === "FLOW" ? null : ( {taskType === "FLOW" ? null : (
<div <div
......
...@@ -6,10 +6,14 @@ ...@@ -6,10 +6,14 @@
box-shadow: 0px 3px 12px 0px rgba(3, 47, 105, 0.09); box-shadow: 0px 3px 12px 0px rgba(3, 47, 105, 0.09);
border-radius: 6px; border-radius: 6px;
border: 2px solid #ffffff; border: 2px solid #ffffff;
transition: box-shadow 0.2s cubic-bezier(0, 0, 1, 1);
} }
.itemBox:hover { .itemBox:hover {
box-shadow: 0px 6px 24px 0px rgba(3, 47, 105, 0.14); box-shadow: 0px 6px 24px 0px rgba(3, 47, 105, 0.14);
} }
.itemBox:hover .titleBox {
color: #1370ff;
}
.itemHeaderBox { .itemHeaderBox {
display: flex; display: flex;
......
...@@ -87,11 +87,9 @@ const WorkflowOperator = observer(() => { ...@@ -87,11 +87,9 @@ const WorkflowOperator = observer(() => {
}} }}
/> />
<MySelect <MySelect
title="所属产品"
isTitle={true}
options={ options={
[ [
{ label: "全部", value: "all" }, { label: "全部产品", value: "all" },
...productListStore?.productList, ...productListStore?.productList,
] || [] ] || []
} }
...@@ -103,14 +101,12 @@ const WorkflowOperator = observer(() => { ...@@ -103,14 +101,12 @@ const WorkflowOperator = observer(() => {
sx={{ width: "150px", height: "32px" }} sx={{ width: "150px", height: "32px" }}
/> />
<MySelect <MySelect
title="环境类型"
isTitle={true}
value={searchParams.type} value={searchParams.type}
onChange={(e) => { onChange={(e) => {
setSearchParams({ ...searchParams, type: e }); setSearchParams({ ...searchParams, type: e });
}} }}
options={[ options={[
{ label: "全部", value: "all" }, { label: "全部环境", value: "all" },
{ {
label: "批式", label: "批式",
value: "BATCH", value: "BATCH",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment