dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6491 from dataease/dev-v2

Browse Source 
Dev v2
This commit is contained in:
fit2cloudrd 2023-11-01 16:59:49 +08:00 committed by GitHub
commit 443371c8bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/core-frontend/src/views/workbranch/ShortcutTable.vue
View File

@ -336,8 +336,9 @@ const getEmptyDesc = (): string => {
padding: 8px 24px 0 24px; padding: 8px 24px 0 24px;
background: #fff; background: #fff;
border-radius: 4px; border-radius: 4px;
height: calc(100% - 280px); // height: calc(100% - 280px);
margin-top: 16px; // margin-top: 16px;
height: 100%;
.select-type-list { .select-type-list {
width: 104px; width: 104px;

4
core/core-frontend/src/views/workbranch/index.vue
View File

@ -17,6 +17,8 @@ const { t } = useI18n()
const busiDataMap = computed(() => interactiveStore.getData) const busiDataMap = computed(() => interactiveStore.getData)
const busiCountCardList = ref([]) const busiCountCardList = ref([])
const showTemplate = ref(false)
const router = useRouter() const router = useRouter()
const quickCreationList = shallowRef([ const quickCreationList = shallowRef([
@ -159,7 +161,7 @@ fillCardInfo()
</div> </div>
</div> </div>
<div class="template-market-dashboard"> <div class="template-market-dashboard">
<div class="template-market"> <div v-if="showTemplate" class="template-market">
<div class="label"> <div class="label">
模版市场 模版市场
<div class="expand-all"> <div class="expand-all">

2
installer/install.sh
View File

@ -183,7 +183,7 @@ else
cd ${DE_RUN_BASE} && docker-compose $compose_files pull 2>&1 cd ${DE_RUN_BASE} && docker-compose $compose_files pull 2>&1
DEVERSION=$(cat ${CURRENT_DIR}/dataease/templates/version) DEVERSION=$(cat ${CURRENT_DIR}/dataease/templates/version)
#curl -sfL https://resource.fit2cloud.com/installation-log.sh | sh -s de ${INSTALL_TYPE} ${DEVERSION} curl -sfL https://resource.fit2cloud.com/installation-log.sh | sh -s de ${INSTALL_TYPE} ${DEVERSION}
cd - cd -
fi fi