From a142cedefc2ba901b8efbd7d350d9de87dfbba68 Mon Sep 17 00:00:00 2001
From: nichenqin <nichenqin@hotmail.com>
Date: Sat, 31 Aug 2024 13:04:02 +0800
Subject: [PATCH 1/4] fix: remove button from readable schema

---
 packages/table/src/modules/schema/schema.vo.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/table/src/modules/schema/schema.vo.ts b/packages/table/src/modules/schema/schema.vo.ts
index 22bdf81a2..ac6c6a226 100644
--- a/packages/table/src/modules/schema/schema.vo.ts
+++ b/packages/table/src/modules/schema/schema.vo.ts
@@ -176,7 +176,7 @@ export class Schema extends ValueObject<Field[]> {
 
   get readableSchema() {
     const schema = objectify(
-      this.fields,
+      this.fields.filter((f) => f.type !== "button"),
       (f) => f.name.value,
       (f) => f.valueSchema,
     )
@@ -185,7 +185,7 @@ export class Schema extends ValueObject<Field[]> {
   }
 
   getViewReadableSchema(table: TableDo, view: View) {
-    const viewFields = table.getOrderedVisibleFields(view.id.value)
+    const viewFields = table.getOrderedVisibleFields(view.id.value).filter((f) => f.type !== "button")
     const schema = objectify(
       viewFields,
       (f) => f.name.value,

From beeaa9db6fe8d7757e50517011afbe4550c7cc88 Mon Sep 17 00:00:00 2001
From: nichenqin <nichenqin@hotmail.com>
Date: Sat, 31 Aug 2024 13:15:21 +0800
Subject: [PATCH 2/4] fix: fix select option picker

---
 .../src/lib/components/blocks/option/option-picker.svelte       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/frontend/src/lib/components/blocks/option/option-picker.svelte b/apps/frontend/src/lib/components/blocks/option/option-picker.svelte
index e9de91766..12b994457 100644
--- a/apps/frontend/src/lib/components/blocks/option/option-picker.svelte
+++ b/apps/frontend/src/lib/components/blocks/option/option-picker.svelte
@@ -38,9 +38,9 @@
         variant="outline"
         role="combobox"
         aria-expanded={open}
-        class={cn("w-full justify-between overflow-hidden", $$restProps.class)}
         {disabled}
         {...$$restProps}
+        class={cn("w-full justify-between overflow-hidden", $$restProps.class)}
       >
         {#if selectedValue}
           <Option option={selectedValue} />

From 76fe4417770c0510a23246ffefb5baae3f517ce0 Mon Sep 17 00:00:00 2001
From: nichenqin <nichenqin@hotmail.com>
Date: Sat, 31 Aug 2024 13:27:47 +0800
Subject: [PATCH 3/4] ui: fix field ui

---
 .../blocks/filters-editor/field-filter-control.svelte         | 4 ++--
 .../components/blocks/filters-editor/filters-editor.svelte    | 2 +-
 .../schema/fields/variants/button-field/button-field.vo.ts    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte b/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte
index 543acce9d..f3e224c9c 100644
--- a/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte
+++ b/apps/frontend/src/lib/components/blocks/filters-editor/field-filter-control.svelte
@@ -20,9 +20,9 @@
   $: hasValue = op ? (field?.isOpHasValue(op) ?? false) : false
 </script>
 
-<div class="col-span-8 flex flex-1 items-center gap-0">
+<div class={cn("col-span-8 flex flex-1 items-center gap-0", $$restProps.class)}>
   <OpPicker {disabled} {field} bind:value={op} class={cn("rounded-l-none", hasValue && "rounded-r-none")} />
   {#if hasValue}
-    <FilterInput {disabled} class="w-full flex-1" {field} bind:value {op} />
+    <FilterInput {disabled} class="flex-1" {field} bind:value {op} />
   {/if}
 </div>
diff --git a/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte b/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
index cf445518e..2d790758e 100644
--- a/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
+++ b/apps/frontend/src/lib/components/blocks/filters-editor/filters-editor.svelte
@@ -135,7 +135,7 @@
                 bind:value={child.field}
                 class={cn("col-span-4 rounded-r-none border-r-0")}
               />
-              <FieldFilterControl {disabled} {field} bind:op={child.op} bind:value={child.value} />
+              <FieldFilterControl class="col-span-8 overflow-hidden" {disabled} {field} bind:op={child.op} bind:value={child.value} />
             </div>
             <div class="col-span-1 flex items-center gap-2">
               {#if !readonly && $hasPermission("table:update")}
diff --git a/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts b/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts
index 56dccf6db..2ae7e852f 100644
--- a/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts
+++ b/packages/table/src/modules/schema/fields/variants/button-field/button-field.vo.ts
@@ -24,7 +24,7 @@ export const buttonFieldUpdateAction = z.object({
   confirm: z.boolean().optional(),
 })
 
-const buttonCondition = z.null()
+const buttonCondition = z.undefined()
 
 export const buttonDisabled = createConditionGroup(buttonCondition, buttonCondition)
 export type IButtonDisabled = z.infer<typeof buttonDisabled>

From 39ed6437c178d9e3001fa065794970a973a04bf9 Mon Sep 17 00:00:00 2001
From: GitHub actions <noreply@github.com>
Date: Sat, 31 Aug 2024 05:30:16 +0000
Subject: [PATCH 4/4] Prepare release v1.0.0-49

---
 CHANGELOG.md | 2 ++
 package.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a23019990..f8fe44ea2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 
+## v1.0.0-49
+
 ## v1.0.0-48
 
 
diff --git a/package.json b/package.json
index fdd2482a3..e3fe14eb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "undb",
-  "version": "1.0.0-48",
+  "version": "1.0.0-49",
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production bun --bun turbo build",