Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/hit-pay/orchid into next
Browse files Browse the repository at this point in the history
  • Loading branch information
kewcoder committed Dec 9, 2024
2 parents 4006ead + a71df16 commit 524cf6e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@orchidui/core",
"description": "Orchid UI, Library Vue 3 tailwind css",
"version": "1.0.15",
"version": "1.0.16",
"type": "module",
"scripts": {
"build": "vite build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ defineExpose({
class="text-oc-text-400"
/>
</div>
<div class="flex items-center gap-x-4 w-full p-5 pl-0">
<div class="flex items-center gap-x-4 w-full p-5 pl-0 overflow-hidden">
<slot name="logo"></slot>
<div class="flex flex-col flex-1 gap-y-3">
<div class="flex flex-col flex-1 gap-y-3 overflow-hidden">
<div class="flex items-center justify-between">
<div class="flex text-sm text-oc-text-400 items-center gap-x-3 overflow-hidden">
<span v-if="title" class="text-base text-oc-text font-medium truncate">
Expand Down
10 changes: 7 additions & 3 deletions packages/core/src/Form/Select/OcSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ const props = defineProps({
type: String,
default: 'Placeholder'
},
searchPlaceholder: {
defaultSearchPlaceholder: {
type: String,
default: 'Search'
},
inlineSearchPlaceholder: {
type: String,
default: 'Search'
},
Expand Down Expand Up @@ -334,7 +338,7 @@ defineExpose({
<template v-if="isInlineSearch && isFilterable && !localValueOption">
<Input
v-model="query"
:placeholder="searchPlaceholder"
:placeholder="defaultSearchPlaceholder"
input-class="!border-none !shadow-none"
:is-readonly="!isDropdownOpened"
@update:model-value="$emit('onSearchKeywords', query)"
Expand Down Expand Up @@ -387,7 +391,7 @@ defineExpose({
ref="searchInputRef"
v-model="query"
icon="search"
placeholder="Search"
:placeholder="inlineSearchPlaceholder"
@update:model-value="$emit('onSearchKeywords', query)"
>
<template #icon>
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@orchidui/dashboard",
"description": "Orchid Dashboard UI , Dashboard Ui Library Vue 3 tailwind css",
"version": "1.0.15",
"version": "1.0.16",
"type": "module",
"scripts": {
"build": "vite build"
Expand Down Expand Up @@ -33,6 +33,6 @@
"rollup": "npm:@rollup/wasm-node"
},
"dependencies": {
"@orchidui/core": "^1.0.15"
"@orchidui/core": "^1.0.16"
}
}

0 comments on commit 524cf6e

Please sign in to comment.