Skip to content

S
so-manage-ui
Commit 4f2abe4a authored by whidy#mbp's avatar whidy#mbp
Browse files
Options

Merge branch 'dev' of ssh://cloud.wodcloud.com:10022/apaas/apaas-system-ui into dev0508

parents e4af79bc 2b2c2195
Expand all Show whitespace changes
Inline Side-by-side
Showing with 199 additions and 120 deletions
.beagle.yml
View file @ 4f2abe4a
# platform:
# runner: 10.11.92.37
kind: pipeline
name: dev0508
name: dev
trigger:
branch:
- dev0508
- dev
clone:
disable: true
......@@ -65,7 +65,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5 # 基础镜像,根据项目需求进行使用，如果第三方登录改成ui-base
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui # 生成镜像的 分组/名称
version: "5.0.15" # 版本号
version: "5.0.14" # 版本号
channel: amd64
args: "TARGETOS=linux,TARGETARCH=amd64" # 不同架构的构建参数
registry: registry.cn-qingdao.aliyuncs.com # 私有仓库地址
......@@ -77,10 +77,10 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
- name: deploy-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/devops-kubernetes:1.0
settings:
namespace: apaas-v5
namespace: apaas-v5-demo
deployment: apaas-manage-ui
container: apaas-manage-ui
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-amd64
image: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-amd64
environment:
KUBERNETES_SERVER:
from_secret: KUBERNETES_SERVER
......@@ -96,7 +96,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-arm64
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.15"
version: "5.0.14"
channel: arm64
args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -114,7 +114,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-ppc64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.15"
version: "5.0.14"
channel: ppc64le
args: "TARGETOS=linux,TARGETARCH=ppc64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -132,7 +132,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
base: registry.cn-qingdao.aliyuncs.com/wod/nginx:1.19.5-mips64le
dockerfile: .beagle/dockerfile
repo: wod/apaas-system-ui
version: "5.0.15"
version: "5.0.14"
channel: mips64le
args: "TARGETOS=linux,TARGETARCH=mips64le"
registry: registry.cn-qingdao.aliyuncs.com
......@@ -145,8 +145,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
image: registry.cn-qingdao.aliyuncs.com/wod/devops-docker-manifest:1.0
settings:
platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/mips64le
template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-ARCH
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15
template: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-ARCH
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14
username:
from_secret: REGISTRY_USER_ALIYUN
password:
......@@ -181,7 +181,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-amd64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-amd64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-amd64
registry: registry.cn-qingdao.aliyuncs.com
......@@ -199,7 +199,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-arm64
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-arm64
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-arm64
registry: registry.cn-qingdao.aliyuncs.com
......@@ -217,7 +217,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-ppc64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-ppc64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-ppc64le
registry: registry.cn-qingdao.aliyuncs.com
......@@ -235,7 +235,7 @@ steps:
REGISTRY_PASSWORD:
from_secret: REGISTRY_PASSWORD_ALIYUN
settings:
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.15-mips64le
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0.14-mips64le
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-system-ui:5.0-mips64le
##--------------对于需要保密的信息隐藏，减少账户信息的泄密⬇-----------------##
---
......
src/components/ability-card.vue
View file @ 4f2abe4a
......@@ -2,25 +2,46 @@
<div class="item_card" :style="{ height: props.flag ? '242px' : '206px' }">
<div class="action_box" v-if="props.flag">
<div class="can_click_text" @click="deleteItem(props.item)">删除</div>
<div class="can_click_text" @click="move(1)" :class="props.item.canDown ? '' : 'disabled'">下移</div>
<div class="can_click_text" @click="move(2)" :class="props.item.canUp ? '' : 'disabled'">上移</div>
<div class="can_click_text" @click="move(1)" :class="props.item.canDown ? '' : 'disabled'">
下移
</div>
<div class="can_click_text" @click="move(2)" :class="props.item.canUp ? '' : 'disabled'">
上移
</div>
</div>
<div class="top_info" :style="{ 'padding-left': !props.flag ? '8px' : '24px' }">
<template v-if="props.item.isSelected">
<el-checkbox
v-if="!props.flag"
class="select_box"
v-model="props.item.checked"
@change="change_check"></el-checkbox>
v-model="props.item.isSelected"
:disabled="props.item.isSelected"
@change="changeSelectedList"></el-checkbox>
</template>
<el-checkbox
v-else-if="!props.flag"
class="select_box"
v-model="checked"
@change="changeSelectedList"></el-checkbox>
<div class="logo">
<img v-if="props.item.ability_logo" :src="JSON.parse(props.item.ability_logo)[0].url" alt="" />
<img
v-if="props.item.ability_logo !== '[]'"
:src="JSON.parse(props.item.ability_logo)[0].url"
alt="" />
<img v-else src="../assets/imgs/img_cover_ability.png" alt="" />
</div>
<div class="info">
<div class="name">
<el-tooltip class="box-item" effect="light" :content="props.item.ability_name" placement="top">
<el-tooltip
class="box-item"
effect="light"
:content="props.item.ability_name"
placement="top">
<span class="ability_name">{{ props.item.ability_name }}</span>
</el-tooltip>
<span class="icon_box openness" :class="openClassObj[props.item.openness_id]">{{ props.item.openness }}</span>
<span class="icon_box openness" :class="openClassObj[props.item.openness_id]">{{
props.item.openness
}}</span>
<span class="icon_box mock" v-if="props.item.include_mock_service">mock</span>
</div>
<div class="count">
......@@ -33,7 +54,8 @@
<div class="line"></div>
<div class="box2">
阅读{{
props.item.browse_count == 0 || (props.item.browse_count && props.item.browse_count < 10000)
props.item.browse_count == 0 ||
(props.item.browse_count && props.item.browse_count < 10000)
? props.item.browse_count
: props.item.browse_count < 10000000
? Math.floor(props.item.browse_count / 10000) + "万+"
......@@ -53,7 +75,9 @@
</div>
</div>
</div>
<div class="bottom_info" :style="{ height: props.flag ? 'calc(100% - 128px)' : 'calc(100% - 92px)' }">
<div
class="bottom_info"
:style="{ height: props.flag ? 'calc(100% - 128px)' : 'calc(100% - 92px)' }">
<div class="desc" :title="props.item.synopsis">
{{ props.item.synopsis }}
</div>
......@@ -68,8 +92,9 @@
</template>
<script setup>
import { ref } from "vue";
import { useRouter } from "vue-router";
const checked = ref(false);
const router = useRouter();
const props = defineProps({
item: {
......@@ -81,7 +106,7 @@ const props = defineProps({
default: false,
},
});
const emit = defineEmits(["change_check", "deleteItem", "move"]);
const emit = defineEmits(["changeSelectedList", "deleteItem", "move"]);
const openClassObj = {
"9de06ba6-6ee2-4449-91d9-31a1c7554311": "open",
"4e8b4c37-e565-4195-8303-3b1ccd48dd13": "share",
......@@ -89,9 +114,8 @@ const openClassObj = {
"4e8b4c37-e565-4195-8303-3b1ccd48dd16": "sensitive",
};
const change_check = () => {
console.log(props.item);
emit("change_check", props.item);
const changeSelectedList = () => {
emit("changeSelectedList", props.item, checked.value);
};
const deleteItem = (item) => {
emit("deleteItem", item);
......@@ -106,6 +130,10 @@ const move = (type) => {
};
emit("move", temp);
};
defineExpose({
checked
})
</script>
<style lang="scss" scoped>
......
src/components/ability-list.vue
View file @ 4f2abe4a
<template>
<div v-if="!props.flag && props.loading === true">
<div class="empty-tips">数据加载中...</div>
</div>
<div class="card_list">
<div v-for="(e, i) in props.list" :key="'card' + i" class="item">
<template v-if="props.list.length > 0">
<div v-for="(item, i) in props.list" :key="'card' + i" class="item">
<ability-card
v-if="e.id"
:item="e"
@change_check="changeCheck"
ref="itemRefs"
:item="item"
@change-selected-list="changeSelectedList"
:flag="props.flag"
@deleteItem="deleteItem"
@move="move" />
<div v-else class="empty_card" @click="open">
</div>
</template>
<div class="item" v-if="props.flag">
<div v-if="props.list.length < 9" class="empty_card" @click="open">
<span>+</span>
</div>
</div>
......@@ -16,7 +23,9 @@
</template>
<script setup>
import { onMounted, ref } from "vue";
import abilityCard from "./ability-card.vue";
const itemRefs = ref([]);
const props = defineProps({
list: {
type: Array,
......@@ -26,13 +35,16 @@ const props = defineProps({
type: Boolean,
default: false,
},
loading: {
type: Boolean,
default: false,
},
});
const emit = defineEmits(["changeCheck", "openBox", "deleteItem", "move"]);
const changeCheck = (item) => {
emit("changeCheck", item);
const emit = defineEmits(["changeSelectedList", "openBox", "deleteItem", "move"]);
const changeSelectedList = (item, checked) => {
emit("changeSelectedList", item, checked);
};
const open = () => {
console.log(3333);
emit("openBox");
};
const deleteItem = (item) => {
......@@ -41,6 +53,19 @@ const deleteItem = (item) => {
const move = (temp) => {
emit("move", temp);
};
// const setRef = (el, index) => {
// itemRefs.value.push(el)
// }
onMounted(() => {
console.log(itemRefs);
})
defineExpose({
list: props.list,
itemRefs
});
</script>
<style lang="scss" scoped>
......@@ -67,5 +92,9 @@ const move = (temp) => {
font-size: 48px;
font-weight: 100;
}
.empty-tips {
text-align: center;
}
}
</style>
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