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

fix：修复自定义属性新增功能 #108

Merged
merged 5 commits into from
Nov 30, 2023
Merged

fix：修复自定义属性新增功能 #108

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
821c842
fix：修复自定义属性新增功能
lizhijie429 Nov 29, 2023
c1d6219
fix: 修复MetaHtmlText组件控制台警告
lizhijie429 Nov 29, 2023
6e1ae41
fix：调整透传Attributes警告解决方案
lizhijie429 Nov 30, 2023
8281b18
fix：调整透传Attributes警告解决方案
lizhijie429 Nov 30, 2023
d594b56
fix：调整透传Attributes警告解决方案
lizhijie429 Nov 30, 2023
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
94 changes: 49 additions & 45 deletions packages/common/component/MetaHtmlAttributes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
<template>
<div class="attr-header">
<span class="header-title">自定义属性</span>
<tiny-popover
v-model="state.visible"
placement="bottom"
title=""
width="200"
popper-class="option-popper"
trigger="manual"
>
<div class="attr-form">
<icon-close class="icon-close" @click="closePopover"></icon-close>
<tiny-form label-position="left" label-width="53px">
<tiny-form-item label="name">
<tiny-input v-model="state.formData.key"></tiny-input>
</tiny-form-item>
<tiny-form-item label="value">
<tiny-input v-model="state.formData.value"></tiny-input>
</tiny-form-item>
<div class="footer">
<tiny-button size="small" @click="cancel">取消</tiny-button>
<tiny-button size="small" type="primary" @click="save">保存</tiny-button>
</div>
</tiny-form>
<div>
chilingling marked this conversation as resolved.
Show resolved Hide resolved
<div class="attr-header">
<span class="header-title">自定义属性</span>
<tiny-popover
v-model="state.visible"
placement="bottom"
title=""
width="200"
popper-class="option-popper"
trigger="manual"
>
<div class="attr-form">
<icon-close class="icon-close" @click="closePopover"></icon-close>
<tiny-form label-position="left" label-width="53px">
<tiny-form-item label="name">
<tiny-input v-model="state.formData.key"></tiny-input>
</tiny-form-item>
<tiny-form-item label="value">
<tiny-input v-model="state.formData.value"></tiny-input>
</tiny-form-item>
<div class="footer">
<tiny-button size="small" @click="cancel">取消</tiny-button>
<tiny-button size="small" type="primary" @click="save">保存</tiny-button>
</div>
</tiny-form>
</div>

<template #reference>
<tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
<span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
</tiny-tooltip>
</template>
</tiny-popover>
</div>
<div class="attr-list">
<div v-for="item in attrs" :key="item" class="list-item">
<div class="item-content">{{ item.text }}</div>
<div class="item-controller">
<icon-edit @click="edit(item)"></icon-edit>
<icon-del @click="deleteAttr(item)"></icon-del>
</div>
</div>

<template #reference>
<tiny-tooltip class="item" effect="dark" content="新增原生属性" placement="top">
<span class="icon-wrap"><IconPlus @click="addAttr"></IconPlus></span>
</tiny-tooltip>
</template>
</tiny-popover>
</div>
<div class="attr-list">
<div v-for="item in attrs" :key="item" class="list-item">
<div class="item-content">{{ item.text }}</div>
<div class="item-controller">
<icon-edit @click="edit(item)"></icon-edit>
<icon-del @click="deleteAttr(item)"></icon-del>
<div v-if="!attrs.length" class="list-item">
<div class="item-content">无数据</div>
</div>
</div>
<div v-if="!attrs.length" class="list-item">
<div class="item-content">无数据</div>
</div>
<div class="attr-popover"></div>
</div>
<div class="attr-popover"></div>
</template>
<script>
import { reactive, ref, watchEffect } from 'vue'
import { useProperties, useResource } from '@opentiny/tiny-engine-controller'
import { IconDel, IconEdit, IconClose } from '@opentiny/vue-icon'
import { Form, FormItem, Input, Button, Popover } from '@opentiny/vue'
import { IconDel, IconEdit, IconClose, IconPlus } from '@opentiny/vue-icon'
import { Form, FormItem, Input, Button, Popover, Tooltip } from '@opentiny/vue'
import { utils } from '@opentiny/tiny-engine-utils'

export default {
Expand All @@ -62,7 +64,9 @@ export default {
IconEdit: IconEdit(),
IconDel: IconDel(),
TinyPopover: Popover,
IconClose: IconClose()
IconClose: IconClose(),
IconPlus: IconPlus(),
TinyTooltip: Tooltip
},
props: {
modelValue: {
Expand Down
24 changes: 13 additions & 11 deletions packages/common/component/MetaHtmlText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<template>
<div v-if="state.show" class="tiny-radio-buttons">
<div
v-for="(item, index) in data"
:key="item"
:class="['tiny-radio-button', state.active === index ? 'active' : '']"
@click="triggerType(item, index, $event)"
>
<span>{{ item }}</span>
<div>
chilingling marked this conversation as resolved.
Show resolved Hide resolved
<div v-if="state.show" class="tiny-radio-buttons">
<div
v-for="(item, index) in data"
:key="item"
:class="['tiny-radio-button', state.active === index ? 'active' : '']"
@click="triggerType(item, index, $event)"
>
<span>{{ item }}</span>
</div>
</div>
<div class="head-content">
<meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
</div>
</div>
<div class="head-content">
<meta-input v-model="state.text" type="textarea" @change="change"></meta-input>
</div>
</template>
<script>
Expand Down