Compare commits
No commits in common. "70354c14ec463390863a8ff6c51f6a9182b16627" and "f00a959db34da941782afe539cf20a29ff026e5f" have entirely different histories.
70354c14ec
...
f00a959db3
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { computed, h, reactive, ref } from 'vue'
|
||||
import { computed, h, nextTick, reactive, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import AddLink from '@/components/icons/AddLink.vue'
|
||||
import { NButton, NIcon, useThemeVars } from 'naive-ui'
|
||||
|
@ -89,7 +89,7 @@ const fieldColumn = computed(() => ({
|
|||
},
|
||||
scrollable: true,
|
||||
},
|
||||
lineClamp: 1,
|
||||
lineClamp: 10,
|
||||
},
|
||||
filterOptionValue: fieldFilterOption.value,
|
||||
className: inEdit.value ? 'clickable' : '',
|
||||
|
@ -121,7 +121,6 @@ const valueColumn = computed(() => ({
|
|||
},
|
||||
scrollable: true,
|
||||
},
|
||||
lineClamp: 1,
|
||||
},
|
||||
// filterOptionValue: valueFilterOption.value,
|
||||
className: inEdit.value ? 'clickable' : '',
|
||||
|
@ -186,9 +185,9 @@ const resetEdit = () => {
|
|||
currentEditRow.no = 0
|
||||
currentEditRow.key = ''
|
||||
currentEditRow.value = null
|
||||
// if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
// nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
// }
|
||||
if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
}
|
||||
// currentEditRow.format = formatTypes.RAW
|
||||
// currentEditRow.decode = decodeTypes.NONE
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { computed, h, reactive, ref } from 'vue'
|
||||
import { computed, h, nextTick, reactive, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import AddLink from '@/components/icons/AddLink.vue'
|
||||
import { NButton, NIcon, useThemeVars } from 'naive-ui'
|
||||
|
@ -96,7 +96,6 @@ const valueColumn = computed(() => ({
|
|||
},
|
||||
scrollable: true,
|
||||
},
|
||||
lineClamp: 1,
|
||||
},
|
||||
filterOptionValue: valueFilterOption.value,
|
||||
className: inEdit.value ? 'clickable' : '',
|
||||
|
@ -163,9 +162,9 @@ const saveEdit = async (pos, value, decode, format) => {
|
|||
const resetEdit = () => {
|
||||
currentEditRow.no = 0
|
||||
currentEditRow.value = null
|
||||
// if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
// nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
// }
|
||||
if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
}
|
||||
}
|
||||
|
||||
const actionColumn = {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { computed, h, reactive, ref } from 'vue'
|
||||
import { computed, h, nextTick, reactive, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import AddLink from '@/components/icons/AddLink.vue'
|
||||
import { NButton, NIcon, useThemeVars } from 'naive-ui'
|
||||
|
@ -95,7 +95,6 @@ const valueColumn = computed(() => ({
|
|||
},
|
||||
scrollable: true,
|
||||
},
|
||||
lineClamp: 1,
|
||||
},
|
||||
filterOptionValue: valueFilterOption.value,
|
||||
className: inEdit.value ? 'clickable' : '',
|
||||
|
@ -160,9 +159,9 @@ const saveEdit = async (pos, value, decode, format) => {
|
|||
const resetEdit = () => {
|
||||
currentEditRow.no = 0
|
||||
currentEditRow.value = null
|
||||
// if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
// nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
// }
|
||||
if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
}
|
||||
}
|
||||
|
||||
const actionColumn = {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<script setup>
|
||||
import { computed, h, reactive, ref } from 'vue'
|
||||
import { computed, h, nextTick, reactive, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import AddLink from '@/components/icons/AddLink.vue'
|
||||
import { NButton, NIcon, useThemeVars } from 'naive-ui'
|
||||
|
@ -144,7 +144,6 @@ const valueColumn = computed(() => ({
|
|||
},
|
||||
scrollable: true,
|
||||
},
|
||||
lineClamp: 1,
|
||||
},
|
||||
filterOptionValue: valueFilterOption.value,
|
||||
className: inEdit.value ? 'clickable' : '',
|
||||
|
@ -207,9 +206,9 @@ const resetEdit = () => {
|
|||
currentEditRow.no = 0
|
||||
currentEditRow.score = 0
|
||||
currentEditRow.value = null
|
||||
// if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
// nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
// }
|
||||
if (currentEditRow.format !== props.format || currentEditRow.decode !== props.decode) {
|
||||
nextTick(() => onFormatChanged(currentEditRow.decode, currentEditRow.format))
|
||||
}
|
||||
}
|
||||
|
||||
const actionColumn = {
|
||||
|
|
|
@ -172,6 +172,7 @@ const exThemeVars = computed(() => {
|
|||
:options="preferencesOptions"
|
||||
:render-icon="({ icon }) => render.renderIcon(icon)"
|
||||
:render-label="({ label }) => render.renderLabel($t(label), { class: 'context-menu-item' })"
|
||||
content-class="nav-menu-button"
|
||||
trigger="click"
|
||||
@select="onSelectPreferenceMenu">
|
||||
<icon-button :icon="Config" :size="iconSize" :stroke-width="3" />
|
||||
|
@ -181,6 +182,7 @@ const exThemeVars = computed(() => {
|
|||
:icon="QRCode"
|
||||
:size="iconSize"
|
||||
:tooltip-delay="100"
|
||||
class="nav-menu-button"
|
||||
t-tooltip="ribbon.wechat_official"
|
||||
@click="openWechatOfficial" />
|
||||
<icon-button
|
||||
|
@ -189,12 +191,14 @@ const exThemeVars = computed(() => {
|
|||
:icon="Twitter"
|
||||
:size="iconSize"
|
||||
:tooltip-delay="100"
|
||||
class="nav-menu-button"
|
||||
t-tooltip="ribbon.follow_x"
|
||||
@click="openX" />
|
||||
<icon-button
|
||||
:icon="Github"
|
||||
:size="iconSize"
|
||||
:tooltip-delay="100"
|
||||
class="nav-menu-button"
|
||||
t-tooltip="ribbon.github"
|
||||
@click="openGithub" />
|
||||
</div>
|
||||
|
@ -276,10 +280,15 @@ const exThemeVars = computed(() => {
|
|||
.nav-menu-item {
|
||||
align-items: center;
|
||||
padding: 10px 0 15px;
|
||||
gap: 20px;
|
||||
--wails-draggable: none;
|
||||
|
||||
button {
|
||||
margin: 10px 0;
|
||||
.nav-menu-button {
|
||||
margin-bottom: 6px;
|
||||
|
||||
:hover {
|
||||
color: v-bind('themeVars.primaryColor');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue