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.

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

feat: Modify the outer class name of the module #1181

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/common/component/PluginSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
</div>
<slot name="progress"></slot>
<div class="plugin-setting-content">
<div class="plugin-setting-content lowcode-scrollbar">
<slot name="content"></slot>
</div>
</div>
Expand Down
238 changes: 122 additions & 116 deletions packages/plugins/block/src/Main.vue
Original file line number Diff line number Diff line change
@@ -1,123 +1,125 @@
<template>
<plugin-panel
class="block-manage"
title="区块管理"
:docsUrl="docsUrl"
:isShowDocsIcon="true"
:isCloseLeft="false"
@close="closePanel"
>
<template #header>
<svg-button name="add-page" placement="bottom" tips="新建区块" @click="openBlockAdd"></svg-button>
</template>
<template #content>
<div class="app-manage-type">
<tiny-select
ref="groupSelect"
v-model="state.categoryId"
popper-class="block-popper"
:placeholder="groupLabels.selectPlaceholder"
filterable
:filter-method="categoryFilter"
clearable
top-create
@top-create-click="createCategory"
@change="changeCategory"
@clear="changeCategory"
@visible-change="handleSelectVisibleChange"
class="search-select"
>
<tiny-option
v-for="item in categoryList"
:key="item.id"
:label="item.name"
:value="item.id"
class="block-group-option-item"
<div class="plugin-block">
<plugin-panel
class="block-manage"
title="区块管理"
:docsUrl="docsUrl"
:isShowDocsIcon="true"
:isCloseLeft="false"
@close="closePanel"
>
<template #header>
<svg-button name="add-page" placement="bottom" tips="新建区块" @click="openBlockAdd"></svg-button>
</template>
<template #content>
<div class="app-manage-type">
<tiny-select
ref="groupSelect"
v-model="state.categoryId"
popper-class="block-popper"
:placeholder="groupLabels.selectPlaceholder"
filterable
:filter-method="categoryFilter"
clearable
top-create
@top-create-click="createCategory"
@change="changeCategory"
@clear="changeCategory"
@visible-change="handleSelectVisibleChange"
class="search-select"
>
<div class="block-item">
<span>{{ item.name }}</span>
<div class="item-btns">
<svg-button
class="item-icon"
name="to-edit"
:hoverBgColor="false"
@click.stop="editCategory(item)"
></svg-button>
<tiny-popover
:modelValue="state.currentDeleteGroupId === item.id"
placement="right"
trigger="manual"
popper-class="block-category-option-popper-wrapper"
@update:modelValue="handleChangeDeletePopoverVisible"
>
<div class="popper-confirm" @mousedown.stop="">
<div class="popper-confirm-header">删除</div>
<div class="popper-confirm-content">
<span class="title">{{ groupLabels.deletePrompt }}</span>
<tiny-option
v-for="item in categoryList"
:key="item.id"
:label="item.name"
:value="item.id"
class="block-group-option-item"
>
<div class="block-item">
<span>{{ item.name }}</span>
<div class="item-btns">
<svg-button
class="item-icon"
name="to-edit"
:hoverBgColor="false"
@click.stop="editCategory(item)"
></svg-button>
<tiny-popover
:modelValue="state.currentDeleteGroupId === item.id"
placement="right"
trigger="manual"
popper-class="block-category-option-popper-wrapper"
@update:modelValue="handleChangeDeletePopoverVisible"
>
<div class="popper-confirm" @mousedown.stop="">
<div class="popper-confirm-header">删除</div>
<div class="popper-confirm-content">
<span class="title">{{ groupLabels.deletePrompt }}</span>
</div>
<div class="popper-confirm-footer">
<tiny-button class="cancel-btn" size="small" @click="handleShowDeleteModal(null)"
>取消</tiny-button
>
<tiny-button class="confirm-btn" size="small" type="primary" @click="delCategory(item.id)"
>确定</tiny-button
>
</div>
</div>
<div class="popper-confirm-footer">
<tiny-button class="cancel-btn" size="small" @click="handleShowDeleteModal(null)"
>取消</tiny-button
>
<tiny-button class="confirm-btn" size="small" type="primary" @click="delCategory(item.id)"
>确定</tiny-button
>
</div>
</div>
<template #reference>
<svg-button
v-if="!item.blocks.length"
class="item-icon"
name="delete"
:hoverBgColor="false"
@click.stop="handleShowDeleteModal(item.id)"
></svg-button>
</template>
</tiny-popover>
<template #reference>
<svg-button
v-if="!item.blocks.length"
class="item-icon"
name="delete"
:hoverBgColor="false"
@click.stop="handleShowDeleteModal(item.id)"
></svg-button>
</template>
</tiny-popover>
</div>
</div>
</div>
</tiny-option>
</tiny-select>
</div>
<div class="app-manage-search">
<tiny-search v-model="state.searchKey" placeholder="搜索">
<template #prefix>
<tiny-icon-search />
</template>
</tiny-search>
</div>
<div class="plugin-block-list">
<plugin-block-list
:data="state.blockList"
:isBlockManage="true"
:showBlockShot="true"
:blockStyle="state.layout"
default-icon-tip="查看区块"
:externalBlock="externalBlock"
@editBlock="editBlock"
@iconClick="openSettingPanel"
></plugin-block-list>
</div>
<block-setting></block-setting>
<div class="block-footer">
<tiny-dropdown trigger="click" @item-click="changeType">
<span>
<span>{{ state.sortTypeLabel }}</span>
</span>
<template #dropdown>
<tiny-dropdown-menu
popper-class="my-class"
placement="top"
:options="state.sortOptions"
></tiny-dropdown-menu>
</template>
</tiny-dropdown>
<block-group-arrange v-model="state.layout" :arrangeList="state.arrangeList"></block-group-arrange>
</div>
</template>
</plugin-panel>
<category-edit v-model="state.editVisible" :initialValue="state.groupInitialValue"></category-edit>
<save-new-block :boxVisibility="boxVisibility" @close="close"></save-new-block>
</tiny-option>
</tiny-select>
</div>
<div class="app-manage-search">
<tiny-search v-model="state.searchKey" placeholder="搜索">
<template #prefix>
<tiny-icon-search />
</template>
</tiny-search>
</div>
<div class="plugin-block-list">
<plugin-block-list
:data="state.blockList"
:isBlockManage="true"
:showBlockShot="true"
:blockStyle="state.layout"
default-icon-tip="查看区块"
:externalBlock="externalBlock"
@editBlock="editBlock"
@iconClick="openSettingPanel"
></plugin-block-list>
</div>
<block-setting></block-setting>
<div class="block-footer">
<tiny-dropdown trigger="click" @item-click="changeType">
<span>
<span>{{ state.sortTypeLabel }}</span>
</span>
<template #dropdown>
<tiny-dropdown-menu
popper-class="my-class"
placement="top"
:options="state.sortOptions"
></tiny-dropdown-menu>
</template>
</tiny-dropdown>
<block-group-arrange v-model="state.layout" :arrangeList="state.arrangeList"></block-group-arrange>
</div>
</template>
</plugin-panel>
<category-edit v-model="state.editVisible" :initialValue="state.groupInitialValue"></category-edit>
<save-new-block :boxVisibility="boxVisibility" @close="close"></save-new-block>
</div>
</template>

<script lang="jsx">
Expand Down Expand Up @@ -450,6 +452,10 @@ export default {
</script>

<style lang="less" scoped>
.plugin-block {
width: 100%;
height: 100%;
}
.app-manage-type {
padding: 0 10px;
margin: 12px 0;
Expand Down
11 changes: 7 additions & 4 deletions packages/plugins/block/src/styles/vars.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.block-manage {
.plugin-block {
--te-block-alert-text-color: var(--te-common-text-weaken);
--te-block-tip-color-error: var(--te-common-color-error);
// 区块列表 - 面板
Expand All @@ -10,9 +10,6 @@
// 绑定时icon图标颜色
--te-block-panel-footer-bind-icon-color: var(--te-common-text-checked);
--te-block-panel-footer-bg-color-active: var(--te-common-bg-secondary);
// 区块 - 删除分组气泡框
--te-block-popper-title-text-color: var(--te-common-text-primary);
--te-block-popper-content-text-color: var(--te-common-text-secondary);
// 区块列表 - 列表状态切换图标
--te-block-panel-footer-btn-bg-color: var(--te-common-bg-container);
--te-block-panel-footer-btn-icon-color: var(--te-common-icon-secondary);
Expand All @@ -38,3 +35,9 @@
// 查看指引视频
--te-block-video-tip-text-color: var(--te-common-text-link);
}

.block-category-option-popper-wrapper {
// 区块 - 删除分组气泡框
--te-block-popper-title-text-color: var(--te-common-text-primary);
--te-block-popper-content-text-color: var(--te-common-text-secondary);
}
2 changes: 1 addition & 1 deletion packages/plugins/bridge/src/BridgeManage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</template>
</tiny-search>
</div>
<div class="list">
<div class="list lowcode-scrollbar">
<div
v-for="(item, index) in list"
:key="item.name"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/bridge/src/Main.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<plugin-panel title="资源管理" class="bridge-manage" :isCloseLeft="false" @close="closePanel">
<plugin-panel title="资源管理" class="plugin-bridge" :isCloseLeft="false" @close="closePanel">
<template #header>
<svg-button name="add-utils" placement="left" :tips="tips" @click="addResource('npm')"></svg-button>
</template>
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/bridge/src/styles/vars.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.bridge-manage {
.plugin-bridge {
// 资源管理
--te-bridge-list-text-color: var(--te-common-text-primary);
--te-bridge-list-bg-color: var(--te-common-bg-container);
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceFieldList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<svg-button name="to-edit" :hoverBgColor="false" @click="handleEdit(data)"></svg-button>
</div>
<div class="field-handler" @click="deleteField($event, field)">
<svg-button :hoverBgColor="false" name="text-source-delete"></svg-button>
<svg-button :hoverBgColor="false" name="delete"></svg-button>
</div>
</div>
</data-source-field-form>
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceList.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="datasource-manage-body">
<div class="datasource-manage-body lowcode-scrollbar">
<div class="datasource-list">
<div
v-for="(item, index) in dataSourceList"
Expand Down
Loading