From 42fb0f4151f1906731f7983f18537385e11bca71 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Mon, 10 Jul 2023 16:27:58 +0800
Subject: [PATCH] * Code for task #97037.

---
 lib/zin/wg/formpanel/js/v1.js      | 17 +++++++++++++----
 lib/zin/wg/formsettingbtn/js/v1.js |  9 +++++++++
 module/story/ui/create.html.php    |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/zin/wg/formpanel/js/v1.js b/lib/zin/wg/formpanel/js/v1.js
index b195bc8f60..c173efd167 100644
--- a/lib/zin/wg/formpanel/js/v1.js
+++ b/lib/zin/wg/formpanel/js/v1.js
@@ -11,13 +11,22 @@ function hideSingleField(hiddenFields)
         $formGroup  = $this.closest('.form-group');
         if($inputGroup.length == 1)
         {
-          $prev = $this.prev();
-          if($prev.hasClass('input-group-addon')) $prev.addClass('hidden');
-          $this.addClass('hidden');
+            $prev = $this.prev();
+            if($prev.hasClass('input-group-addon')) $prev.addClass('hidden');
+
+            $this.addClass('hidden');
+            if($this.hasClass('pick-value'))
+            {
+                $pickBox = $this.closest('.pick').parent();
+                $pickBox.addClass('hidden');
+
+                $prev = $pickBox.prev();
+                if($prev.hasClass('input-group-addon')) $prev.addClass('hidden');
+            }
         }
         else
         {
-          $formGroup.addClass('hidden');
+            $formGroup.addClass('hidden');
         }
     })
 
diff --git a/lib/zin/wg/formsettingbtn/js/v1.js b/lib/zin/wg/formsettingbtn/js/v1.js
index b9faf05707..46dd5ea891 100644
--- a/lib/zin/wg/formsettingbtn/js/v1.js
+++ b/lib/zin/wg/formsettingbtn/js/v1.js
@@ -78,7 +78,16 @@ function toggleSingleField(customFields, showFields)
         {
             $prev = $this.prev();
             if($prev.hasClass('input-group-addon')) $prev.toggleClass('hidden', hidden);
+
             $this.toggleClass('hidden', hidden);
+            if($this.hasClass('pick-value'))
+            {
+                $pickBox = $this.closest('.pick').parent();
+                $pickBox.toggleClass('hidden', hidden);
+
+                $prev = $pickBox.prev();
+                if($prev.hasClass('input-group-addon')) $prev.toggleClass('hidden', hidden);
+            }
         }
         else
         {
diff --git a/module/story/ui/create.html.php b/module/story/ui/create.html.php
index 23d94b2737..bd282b5df6 100644
--- a/module/story/ui/create.html.php
+++ b/module/story/ui/create.html.php
@@ -332,7 +332,7 @@ formPanel
                 $lang->story->category,
                 select(set::name('category'), set::items($fields['category']['options']), set::value($fields['category']['default'])),
                 $lang->story->pri,
-                select(set::name('pri'), set::items($fields['pri']['options']), set::value($fields['pri']['default'])),
+                priPicker(set::name('pri'), set::items($fields['pri']['options']), set::value($fields['pri']['default'])),
                 $lang->story->estimateAB,
                 input(set::name('estimate'), set::placeholder($lang->story->hour), set::value($fields['estimate']['default'])),
             )