From c83902cb926eef935e08cdf8f8bc3fe4de5cf6bf Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 28 May 2019 11:20:30 +0800
Subject: [PATCH]  * finish task #5585.

---
 module/block/js/admin.js     | 14 ++++++++++----
 module/block/js/dashboard.js |  2 --
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/block/js/admin.js b/module/block/js/admin.js
index 0ff9c4c3ac..b4553f34da 100644
--- a/module/block/js/admin.js
+++ b/module/block/js/admin.js
@@ -1,5 +1,11 @@
 $(function()
 {
+    var blockTitle = '';
+    $(document).on('change', '#blockParams #paramstype', function()
+    {
+        $('#blockParams').find('#title').val(blockTitle + ' - ' + $(this).find('option:selected').html());
+    });
+
     var $form = $('#blockAdminForm');
     $form.find('.chosen').chosen();
 
@@ -16,6 +22,9 @@ $(function()
         $form.addClass('form-inited');
         $blockParams.find('input:first').focus();
         if($blockParams.find('#actionLink').size() > 0) $form.attr('action', $blockParams.find('#actionLink').val());
+
+        blockTitle = $blockParams.find('#title').val();
+        if($('#blockParams #paramstype').length > 0) $blockParams.find('#title').val(blockTitle + ' - ' + $('#blockParams #paramstype').find('option:selected').html());
     };
 
     // 获取 html 和 rss 区块参数
@@ -29,10 +38,7 @@ $(function()
         $.get(createLink('block', 'set', 'id=' + blockID + '&type=' + type), function(data)
         {
             updateParams(data);
-            if (type === 'welcome')
-            {
-                $blockParams.find('#title').closest('.form-group').hide();
-            }
+            if(type === 'welcome') $blockParams.find('#title').closest('.form-group').hide();
         });
     };
 
diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js
index f7bd58480b..d2baca0ef0 100644
--- a/module/block/js/dashboard.js
+++ b/module/block/js/dashboard.js
@@ -247,5 +247,3 @@ $(function()
         refreshBlock($(this).closest('.panel'));
     });
 });
-
-