From cfd855ea8980eb8b8ce709379483352dfaf20e51 Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@easycorp.ltd>
Date: Mon, 26 Feb 2024 10:07:58 +0800
Subject: [PATCH] * zin: fix form-grid not work, rename it to form-horz.

---
 lib/zin/wg/form/v1.php                 | 16 ++++++++--------
 lib/zin/wg/formgroup/v1.php            |  2 +-
 lib/zin/wg/formitemdropdown/css/v1.css |  2 +-
 module/host/css/changestatus.ui.css    |  4 ++--
 module/host/css/common.ui.css          |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/zin/wg/form/v1.php b/lib/zin/wg/form/v1.php
index 5cbee7c351..ebde2023e1 100644
--- a/lib/zin/wg/form/v1.php
+++ b/lib/zin/wg/form/v1.php
@@ -14,7 +14,7 @@ class form extends formBase
 {
     protected static array $defineProps = array(
         'items?: array',    // 使用一个列定义对象数组来定义表单项。
-        'grid?: bool=true', // 是否启用网格部件，禅道中所有表单都是网格布局，除非有特殊目的，无需设置此项。
+        'horz?: bool=true', // 是否启用水平布局，禅道中所有表单都是网格布局，除非有特殊目的，无需设置此项。
         'labelWidth?: int', // 标签宽度，单位为像素。
         'actionsClass?: string="form-group no-label"', // 操作按钮栏的 CSS 类。
         'submitBtnText?: string' // 提交按钮文本。
@@ -46,7 +46,7 @@ class form extends formBase
             $item = item(set($item));
         }
 
-        if($this->prop('grid')) return new formRow(inherit($item));
+        if($this->prop('horz')) return new formRow(inherit($item));
 
         return new formGroup(inherit($item));
     }
@@ -54,29 +54,29 @@ class form extends formBase
     protected function buildActions(): wg|null
     {
         $actions = parent::buildActions();
-        if($this->prop('grid') && !empty($actions)) $actions = div(setClass('form-row'), $actions);
+        if($this->prop('horz') && !empty($actions)) $actions = div(setClass('form-row'), $actions);
         return $actions;
     }
 
     protected function buildProps(): array
     {
-        list($grid, $labelWidth) = $this->prop(array('grid', 'labelWidth'));
+        list($horz, $labelWidth) = $this->prop(array('horz', 'labelWidth'));
         $props = parent::buildProps();
-        if($grid)               $props[] = setClass('form-grid');
-        if(!empty($labelWidth)) $props[] = setCssVar('form-grid-label-width', $labelWidth);
+        if($horz)               $props[] = setClass('form-horz');
+        if(!empty($labelWidth)) $props[] = setCssVar('form-horz-label-width', $labelWidth);
 
         return $props;
     }
 
     protected function buildContent(): array
     {
-        list($items, $grid) = $this->prop(array('items', 'grid'));
+        list($items, $horz) = $this->prop(array('items', 'horz'));
 
         $list     = is_array($items) ? array_map(array($this, 'onBuildItem'), $items) : array();
         $children = $this->children();
         if(!empty($children)) $list = array_merge($list, $children);
 
-        if($grid)
+        if($horz)
         {
             foreach($list as $key => $item)
             {
diff --git a/lib/zin/wg/formgroup/v1.php b/lib/zin/wg/formgroup/v1.php
index 28262a551a..d7f01fcb9a 100644
--- a/lib/zin/wg/formgroup/v1.php
+++ b/lib/zin/wg/formgroup/v1.php
@@ -54,7 +54,7 @@ class formGroup extends wg
             set::className('form-group', $required ? 'required' : null, ($label === false || $label === null) ? 'no-label' : null, empty($width) ? null : 'grow-0'),
             zui::width($width),
             set($this->getRestProps()),
-            setCssVar('form-grid-label-width', $labelWidth),
+            setCssVar('form-horz-label-width', $labelWidth),
             empty($label) && $label !== '0' ? null : new formLabel
             (
                 set::className($labelClass, $strong ? 'font-bold' : null),
diff --git a/lib/zin/wg/formitemdropdown/css/v1.css b/lib/zin/wg/formitemdropdown/css/v1.css
index 37b62ddda2..c221a05870 100644
--- a/lib/zin/wg/formitemdropdown/css/v1.css
+++ b/lib/zin/wg/formitemdropdown/css/v1.css
@@ -1,5 +1,5 @@
 .form-item-dropdown .check-list-inline .checkbox-primary {width: 45%;}
-.form-item-dropdown .form-grid .form-group>.check-list-inline {padding-left: 0; padding-right: 0;}
+.form-item-dropdown .form-horz .form-group>.check-list-inline {padding-left: 0; padding-right: 0;}
 .form-item-dropdown .dropdown-menu .form-row {width: 240px;}
 .form-item-dropdown .dropdown-menu .form-actions {gap: 0;}
 .form-item-dropdown .dropdown-menu .form-actions .btn {min-width: 68px; max-width: 68px; margin-left: 16px;}
diff --git a/module/host/css/changestatus.ui.css b/module/host/css/changestatus.ui.css
index 640ba0c3d0..e95adc7054 100644
--- a/module/host/css/changestatus.ui.css
+++ b/module/host/css/changestatus.ui.css
@@ -1,2 +1,2 @@
-.form-grid .form-label{width: 1rem;}
-.form-grid .form-group{padding-left: 1rem;}
+.form-horz .form-label{width: 1rem;}
+.form-horz .form-group{padding-left: 1rem;}
diff --git a/module/host/css/common.ui.css b/module/host/css/common.ui.css
index 5cc5bb4db7..ab11246a58 100644
--- a/module/host/css/common.ui.css
+++ b/module/host/css/common.ui.css
@@ -8,5 +8,5 @@
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
 #mainNavbar .nav-item>a.active:after {position: absolute; content: ''; border-bottom: 2px solid #2e7fff; inset: 0 6px 0 15px;}
-.form-grid .form-label{width: 8rem;}
-.form-grid .form-group{padding-left: 8rem;}
\ No newline at end of file
+.form-horz .form-label{width: 8rem;}
+.form-horz .form-group{padding-left: 8rem;}