Browse Source

fix: PR requested changes

Signed-off-by: mertmit <mertmit99@gmail.com>
pull/4005/head
mertmit 2 years ago
parent
commit
940478ae54
  1. 8
      packages/nc-gui/components/cell/MultiSelect.vue
  2. 3
      packages/nc-gui/components/cell/SingleSelect.vue

8
packages/nc-gui/components/cell/MultiSelect.vue

@ -149,8 +149,9 @@ watch(isOpen, (n, _o) => {
<span <span
:style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
>{{ op.title }}</span
> >
{{ op.title }}
</span>
</a-tag> </a-tag>
</a-select-option> </a-select-option>
@ -159,7 +160,7 @@ watch(isOpen, (n, _o) => {
v-if="options.find((el) => el.title === val)" v-if="options.find((el) => el.title === val)"
class="rounded-tag" class="rounded-tag"
:style="{ display: 'flex', alignItems: 'center' }" :style="{ display: 'flex', alignItems: 'center' }"
:color="(options.find((el) => el.title === val) as SelectOptionType).color" :color="options.find((el) => el.title === val)?.color"
:closable="active && (vModel.length > 1 || !column?.rqd)" :closable="active && (vModel.length > 1 || !column?.rqd)"
:close-icon="h(MdiCloseCircle, { class: ['ms-close-icon'] })" :close-icon="h(MdiCloseCircle, { class: ['ms-close-icon'] })"
@close="onClose" @close="onClose"
@ -167,8 +168,9 @@ watch(isOpen, (n, _o) => {
<span <span
:style="{ color: tinycolor.mostReadable((options.find((el) => el.title === val) as SelectOptionType).color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{ color: tinycolor.mostReadable((options.find((el) => el.title === val) as SelectOptionType).color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
>{{ val }}</span
> >
{{ val }}
</span>
</a-tag> </a-tag>
</template> </template>
</a-select> </a-select>

3
packages/nc-gui/components/cell/SingleSelect.vue

@ -86,8 +86,9 @@ watch(isOpen, (n, _o) => {
<span <span
:style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }" :style="{ color: tinycolor.mostReadable(op.color || '#ccc', ['#64748b', '#f0f0f0']).toHex8String() }"
:class="{ 'text-sm': isKanban }" :class="{ 'text-sm': isKanban }"
>{{ op.title }}</span
> >
{{ op.title }}
</span>
</a-tag> </a-tag>
</a-select-option> </a-select-option>
</a-select> </a-select>

Loading…
Cancel
Save