知识库引用，知识库搜索回车，表单回车提交BUG

assets/css/styles.css

@@ -6592,7 +6592,7 @@ ul.sub-menu li ul.sub-menu li ul.sub-menu li a {
     border-bottom: 1px solid #c8c7cc !important;
     width: 545px;
     max-height: 500px;
-    /* z-index: 99999; */
+    z-index: 1;
     box-sizing: border-box;
     padding-bottom: 33px;
 }

assets/js/controllers/customform/customformCtrl.js

@@ -7671,8 +7671,12 @@ appFormly.config(
                 }
             },
             controller: ['$scope', '$rootScope', '$modal', 'SweetAlert', 'api_bpm_data', 'api_solution', '$aside', 'api_zsk', 'api_bpm_domain', 'api_wechatfile', 'up_down_file', function ($scope, $rootScope, $modal, SweetAlert, api_bpm_data, api_solution, $aside, api_zsk, api_bpm_domain, api_wechatfile, up_down_file) {
+                $scope.keypressModel = function(e,key){
+                    if(e.keyCode === 13){
+                        $scope.openModel(key);
+                    }
+                }
                 // 引用知识库点击
-
                 $scope.searchKeyWord = '';
                 $scope.openModel = function (key) {
                     // alert(1)//重点
@@ -7727,11 +7731,13 @@ appFormly.config(
                         item.content = item.content.replace(/<p>/g, "").replace(/<\/p>/g, "").replace(/&nbsp;/g, '')
                     }
                     $scope.model.incident.handleDescription = item.content;
-                    $scope.model.incident.category = item.category;
-                    $scope.model.incident.priority.id = item.category.priority.id;
                     $scope.model.incident.title = $scope.model.incident.description = item.title;
-                    item.category.label = item.category.category;
-                    var categoryId = item.category.id;
+                    $scope.model.incident.category = item.category;
+                    if(item.category){
+                        $scope.model.incident.priority.id = item.category.priority.id;
+                        item.category.label = item.category.category;
+                    }
+                    var categoryId = item.category?item.category.id:'';
                     // 引用知识库事件分类后，修改事件分类选中状态，事件分类列表重载
                     function getres(nodes) {
                         if (!nodes || nodes.length == 0) {
@@ -7760,7 +7766,7 @@ appFormly.config(
                         }
                     })
                     // field.$parent.$parent.$parent.model.candidateGroups=item.category.group
-                    $scope.model.candidateGroups = item.category.group
+                    $scope.model.candidateGroups = item.category?item.category.group:{};
                     // 携带关联优先级，事件工单信息的时间
                     if ($scope.model && $scope.model.incident && item.category && item.category.priority && item.category.priority.id) {
                         api_bpm_domain.expectedTime('L' + (item.category.priority.id - 1559)).then(function (res) {
@@ -11017,8 +11023,11 @@ appFormly.config(
                                 options.value(options.model.requester);
                             }
                         },
-                        addRequeter: function (size, options, modal) {
-                            event.preventDefault();
+                        addRequeter: function (size, options, modal, e) {
+                            if(e.clientX === 0){
+                                return;
+                            }
+                            e.preventDefault();
                             var modalInstance = modal.open({
                                 templateUrl: 'assets/views/customform/tpl/modal-add-callrequester.html',
                                 controller: function ($scope, sco, $rootScope, $modalInstance, items, SweetAlert, title, Restangular, APIService, UserService, api_user_data, api_statistic, api_wechatfile) {

assets/views/customform/index.html

@@ -48,7 +48,7 @@
             </div>
         </formly-form>
     </form>
-    <form ng-submit="vm.submit(vm.model,'expand-right')" class="fontcolor-two" ng-if="!oldfromtype">
+    <div class="fontcolor-two" ng-if="!oldfromtype">
         <div class="col-xs-12 panel">
             <section id="page-title-form">
                 <div class="row">
@@ -95,10 +95,10 @@
                 </formly-form>
             </div>
             <div class="center col-xs-12  margin-top-30 margin-bottom-40 ">
-                <button type="submit" ladda="ldloading.expand_right " data-style="expand-right " class="btn btn-isok " ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
+                <button type="button" ng-click="vm.submit(vm.model,'expand-right')" ladda="ldloading.expand_right " data-style="expand-right " class="btn btn-isok " ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
                 <button type="close " class="btn btn-default default " ng-click="closeModel() ">{{vm.model.close}}</button>
                 <button type="button " class="btn btn-zancun" ng-click="save(vm.model) " ng-if="vm.model.startSave||vm.model.saveAgain">{{vm.model.save}}</button>
             </div>
         </div>
-    </form>
+    </div>
 </div>

assets/views/customform/tpl/searchknowledge.html

@@ -8,7 +8,7 @@
 </div>
 <div class="container" style="border-top: 1px solid #c8c7cc;padding-right: 55px;">
     <div class="searchInp">
-        <input type="text" ng-model="searchKeyWord" placeholder="请输入...">
+        <input type="text" ng-model="searchKeyWord" placeholder="请输入..." ng-keypress="keypressModel($event,searchKeyWord)">
         <i class="iconfont icon-fangdajing1" ng-click="openModel(searchKeyWord)"></i>
     </div>
     <div class="mainlist">

assets/views/customform/tpl/ui-requesterinformation.html

@@ -92,7 +92,7 @@
                     <a class="" ng-click="options.templateOptions['changeRequeter']('lg',options,to.modal,model);"><i class="icon iconfont icon-xiugai margin-right-5 fontsizes-14"></i>修改
                     </a> -->
                     
-        <button style=" margin: 0;line-height: 10px;" ng-click="options.templateOptions['addRequeter']('lg',options,to.modal);"
+        <button style=" margin: 0;line-height: 10px;" ng-click="options.templateOptions['addRequeter']('lg',options,to.modal,$event);"
             class="btn btn-addbutton  addbutton col-md-offset-5 col-md-12">添加报修人</button>
         <!-- <button class="btn btn-default default col-md-4 col-md-offset-1" ng-click="options.templateOptions['changeRequeter']('lg',options,to.modal,model)">修改</button> -->
         <!-- </div> -->