Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PATCH: feat: add vue3 build for smart components #237

Merged
merged 2 commits into from
Oct 6, 2022
Merged

PATCH: feat: add vue3 build for smart components #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
589fc96
PATCH: feat: add vue3 build for smart components
NicolasRichel Oct 6, 2022
7f98a30
get rid of template + add constraint when no ghost ref in MultiLineTe…
pvilalta Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion rollup.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ function getAllComponentsBundleConfiguration() {
function getSingleSmartComponentConfigurations() {
const componentNames = ["BIMDataFileManager"];

// Build Vue 2.x compatible components
return [
// Build Vue 2.x compatible components
...componentNames.map(componentName => ({
input: [
`src/BIMDataSmartComponents/${componentName}/${componentName}.vue`,
Expand All @@ -166,6 +166,38 @@ function getSingleSmartComponentConfigurations() {
terser(),
],
})),
// Build Vue 3.x compatible components
...componentNames.map(componentName => ({
input: [
`src/BIMDataSmartComponents/${componentName}/${componentName}.vue`,
],
output: {
file: `dist/js/BIMDataSmartComponents/vue3/${componentName}.js`,
format: "esm",
},
plugins: [
alias({
entries: [
{
find: /BIMDataDirectives\//,
replacement: "BIMDataDirectives/vue3/",
},
],
}),
replace({
"~@/assets": "node_modules/@bimdata/design-system/dist",
delimiters: ["", ""],
preventAssignment: true,
}),
vue3({
template: { isProduction: true },
preprocessStyles: true,
}),
postcss(),
image(),
terser(),
],
})),
];
}

Expand Down
196 changes: 97 additions & 99 deletions src/BIMDataSmartComponents/BIMDataFileManager/BIMDataFileManager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,112 @@
<template>
<div class="bimdata-file-manager">
<template>
<div
class="bimdata-file-manager__header"
:class="{
'bimdata-file-manager__header--xs': xsLayout,
'bimdata-file-manager__header--s': sLayout,
'bimdata-file-manager__header--m': mLayout,
'bimdata-file-manager__header--l': lLayout,
}"
v-if="headerButtons || headerSearch"
>
<template v-if="headerButtons">
<NewFolderButton
:disabled="!currentFolder || currentFolder.user_permission < 100"
:projectId="projectId"
:spaceId="spaceId"
:apiClient="apiClient"
:folder="currentFolder"
@success="onNewFolder"
@error="$emit('error', $event)"
/>
<UploadFileButton
class="bimdata-file-manager__header__upload"
width="25%"
:disabled="!currentFolder || currentFolder.user_permission < 100"
multiple
@upload="uploadFiles"
/>
</template>
<BIMDataSearch
v-if="headerSearch"
:color="searchColor"
class="bimdata-file-manager__search"
width="100%"
placeholder="Search"
v-model="searchText"
ref="search"
clear
radius
/>
</div>
<div class="bimdata-file-manager__navigation">
<div
class="bimdata-file-manager__header"
:class="{
'bimdata-file-manager__header--xs': xsLayout,
'bimdata-file-manager__header--s': sLayout,
'bimdata-file-manager__header--m': mLayout,
'bimdata-file-manager__header--l': lLayout,
}"
v-if="headerButtons || headerSearch"
v-if="navigationShown"
class="bimdata-file-manager__navigation__content"
>
<template v-if="headerButtons">
<NewFolderButton
:disabled="!currentFolder || currentFolder.user_permission < 100"
:projectId="projectId"
:spaceId="spaceId"
:apiClient="apiClient"
:folder="currentFolder"
@success="onNewFolder"
@error="$emit('error', $event)"
/>
<UploadFileButton
class="bimdata-file-manager__header__upload"
width="25%"
:disabled="!currentFolder || currentFolder.user_permission < 100"
multiple
@upload="uploadFiles"
/>
</template>
<BIMDataSearch
v-if="headerSearch"
:color="searchColor"
class="bimdata-file-manager__search"
width="100%"
placeholder="Search"
v-model="searchText"
ref="search"
clear
<BIMDataButton
color="default"
icon
radius
ghost
width="33px"
height="31px"
@click="back"
>
<BIMDataIcon name="arrow" />
</BIMDataButton>
<BIMDataTextbox
:text="currentFolder.name"
cutPosition="middle"
tooltipPosition="bottom"
tooltipColor="primary"
width="calc(100% - 45px)"
/>
</div>
<div class="bimdata-file-manager__navigation">
<div
v-if="navigationShown"
class="bimdata-file-manager__navigation__content"
<div v-else class="bimdata-file-manager__navigation__content--empty">
{{ translate("dmsRoot") }}
</div>
</div>
<template v-if="fileStructure">
<div class="bimdata-file-manager__container" v-if="files.length > 0">
<BIMDataResponsiveGrid
:itemWidth="itemWidth"
rowGap="4px"
columnGap="6px"
>
<BIMDataButton
color="default"
icon
radius
ghost
width="33px"
height="31px"
@click="back"
>
<BIMDataIcon name="arrow" />
</BIMDataButton>
<BIMDataTextbox
:text="currentFolder.name"
cutPosition="middle"
tooltipPosition="bottom"
tooltipColor="primary"
width="calc(100% - 45px)"
<FileCard
:width="itemWidth"
v-for="file of files"
:key="file.id"
:file="file"
:projectId="projectId"
:spaceId="spaceId"
:apiUrl="apiUrl"
:accessToken="accessToken"
@open-folder="openFolder(file)"
:select="select"
:disabled="isDisabled(file)"
:multi="multi"
:selected="isFileSelected(file)"
:success="isFileSucess(file.id)"
@toggle-select="onToggleFileSelect(file)"
@rename="onRename(file)"
@delete="onDelete(file)"
@dowload="onDowload(file)"
@loaded="onFileLoaded(file, $event)"
:writeAccess="currentFolder.user_permission >= 100"
/>
</div>
<div v-else class="bimdata-file-manager__navigation__content--empty">
{{ translate("dmsRoot") }}
</div>
</BIMDataResponsiveGrid>
</div>
<template v-if="fileStructure">
<div class="bimdata-file-manager__container" v-if="files.length > 0">
<BIMDataResponsiveGrid
:itemWidth="itemWidth"
rowGap="4px"
columnGap="6px"
>
<FileCard
:width="itemWidth"
v-for="file of files"
:key="file.id"
:file="file"
:projectId="projectId"
:spaceId="spaceId"
:apiUrl="apiUrl"
:accessToken="accessToken"
@open-folder="openFolder(file)"
:select="select"
:disabled="isDisabled(file)"
:multi="multi"
:selected="isFileSelected(file)"
:success="isFileSucess(file.id)"
@toggle-select="onToggleFileSelect(file)"
@rename="onRename(file)"
@delete="onDelete(file)"
@dowload="onDowload(file)"
@loaded="onFileLoaded(file, $event)"
:writeAccess="currentFolder.user_permission >= 100"
/>
</BIMDataResponsiveGrid>
</div>
<div v-else class="bimdata-file-manager__container--empty">
<div>
<BIMDataIcon name="folderOpen" size="xxxl" fill color="silver" />
<span>{{ translate("emptyFolder") }}</span>
</div>
<div v-else class="bimdata-file-manager__container--empty">
<div>
<BIMDataIcon name="folderOpen" size="xxxl" fill color="silver" />
<span>{{ translate("emptyFolder") }}</span>
</div>
</template>
<BIMDataLoading v-else />
</div>
</template>
<BIMDataLoading v-else />
<div class="bimdata-file-manager__modal" v-if="modalDisplayed">
<RenameModal
:projectId="projectId"
Expand Down
2 changes: 2 additions & 0 deletions ...IMDataSmartComponents/BIMDataFileManager/components/MultiLineTextBox/MultiLineTextBox.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ export default {
},
methods: {
onResize() {
if (!this.$refs.ghost) return;

const height = this.lines * this.lineHeight;
const { height: neededHeight } = this.$refs.ghost.getBoundingClientRect();

Expand Down