Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport

module/task/js/batchcreate.js

@@ -23,6 +23,7 @@ $(function()
         var link = createLink('custom', 'ajaxSaveCustomFields', 'module=task&section=custom&key=batchCreateFields');
         $.post(link, {'fields' : fields}, function()
         {
+            showFields = fields;
             showCheckedFields(fields);
             $('#formSetting').parent().removeClass('open');
 

module/task/js/batchedit.js

@@ -49,4 +49,9 @@ $(document).on('change', 'select', function()
 $(function()
 {
     $('#subNavbar li[data-id="task"]').addClass('active');
+
+    $('#customField').click(function()
+    {
+        hiddenRequireFields();
+    });
 });

module/task/js/common.js

@@ -29,8 +29,6 @@ function setStoryModule()
  */
 function showCheckedFields(fields)
 {
-    showFields = fields;
-
     var fieldList = ',' + fields + ',';
     $('#formSettingForm > .checkboxes > .checkbox-primary > input').each(function()
     {

module/task/view/batchedit.html.php

@@ -15,6 +15,8 @@
 <?php
 $dittoNotice = sprintf($this->lang->task->dittoNotice, $lang->executionCommon);
 js::set('dittoNotice', $dittoNotice);
+js::set('showFields', $showFields);
+js::set('requiredFields', $config->task->edit->requiredFields);
 ?>
 <div id='mainContent' class='main-content fade'>
   <div class='main-header'>