add: 数据必填

editor-app/configuration/properties-default-controllers.js

@@ -146,6 +146,7 @@ angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$root
                             pItem.defaultUnit = item.Unit
                             pItem.defaultValue = item.Type
                             pItem.defaultChecked = item.IsShow === "1" ? true : false
+                            pItem.defaultIsRequired = item.IsRequired
                         }
                     })
                 })
@@ -164,6 +165,7 @@ angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$root
                     el.defaultValue = ""
                     el.defaultChecked = true
                     el.defaultUnit = ""
+                    el.defaultIsRequired = false
                 });
             }
         })
@@ -232,7 +234,8 @@ angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$root
             FormKey: shareformKey,
             IsShow: params.defaultChecked ? 1: 0,
             Type: params.defaultValue,
-            Unit: params.defaultUnit
+            Unit: params.defaultUnit,
+            IsRequired: params.defaultIsRequired
         }
         $http({method: 'POST', url: FLOWABLE.APP_URL.SaveFieldConfig(), data: data})
         .success(function(res) {

editor-app/configuration/properties/form-field-read-config.html

@@ -14,22 +14,25 @@
             <th>字段</th>
             <th>默认值</th>
             <th>单位</th>
+            <th>必填</th>
         </tr>
         <tr ng-repeat="child in childFieldObj.properties">
             <td style="width: 20px;">
                 <input type="checkbox" ng-model="child.defaultChecked" ng-change="changeValue(child)"/>
             </td>
-            <td class="active">{{child.title}}</td>
-            <td class="active">
+            <td class="active" style="width: 80px;" title="{{child.title}}">{{child.title}}</td>
+            <td class="active" style="width: 85px;">
                 <select ng-model="child.defaultValue" ng-change="changeValue(child)">
                     <option value="无">无</option>
                     <option value="本人">本人</option>
                     <option value="本部门">本部门</option>
                     <option value="部门主管">部门主管</option>
                     <option value="财务">财务</option>
+                    <option value="当前时间">当前时间</option>
+                    <option value="所属站点">所属站点</option>
                 </select>
             </td>
-            <td class="active">
+            <td class="active" style="width: 85px;">
                 <select ng-model="child.defaultUnit" ng-change="changeValue(child)">
                     <option value="无">无</option>
                     <option value="个">个</option>
@@ -38,6 +41,9 @@
                     <option value="万元">万元</option>
                 </select>
             </td>
+            <td style="width: 45px;text-align: center;">
+                <input type="checkbox" ng-model="child.defaultIsRequired" ng-change="changeValue(child)"/>
+            </td>
         </tr>
     </table>
 </div>

editor-app/stencil-controller copy.js

@@ -405,7 +405,8 @@ angular.module('flowableModeler')
                                             FormKey: formKey,
                                             IsShow: 1,
                                             Type:"",
-                                            Unit:""
+                                            Unit:"",
+                                            IsRequired: false
                                         })
                                     }
                                 }

editor-app/stencil-controller.js

@@ -406,7 +406,8 @@ angular.module('flowableModeler')
                                             FormKey: formKey,
                                             IsShow: 1,
                                             Type:"",
-                                            Unit:""
+                                            Unit:"",
+                                            IsRequired: false
                                         })
                                     }
                                 }