代码提交

frontend/saas-web/app/view/core/form/DataMultiCombo.js

@@ -123,9 +123,10 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     setValue: function(items) {
         var me = this, rawV = '',
         datas = me.datas,
-        menu = me.menu;
+        menu = me.menu,
+        items = items==null?[]:items;
         if(!Ext.isArray(items)) {
-            if(items.indexOf(',')>0){
+            if(items&&items.indexOf(',')>0){
                 items = items.split(',')
             }else{
                 items = [items]
@@ -183,8 +184,10 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     hideMenu: function(b) {
         if (this.hasVisibleMenu()) {
             var target=b.parentEvent.relatedTarget;
-            if(!((target.className && target.className.indexOf('x-menu')!=-1) || (target.name && target.name.indexOf(this.name)!=-1))){
-                this.menu.hide();
+            if(target){
+                if(!((target.className && target.className.indexOf('x-menu')!=-1) || (target.name && target.name.indexOf(this.name)!=-1))){
+                    this.menu.hide();
+                }
             }
         }
         return this;

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -229,8 +229,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 dataUrl:'/api/account/role/list',
                 fieldLabel: '关联角色',
                 name: 'roleNames',
-                allowBlank:false,
-                maxLength: 20
+                allowBlank:true,
+                maxLength: 20,
+                beforeLabelTextTpl: "",
             },{
                 xtype:'textfield',
                 fieldLabel: '联系电话',
@@ -464,6 +465,10 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         });
         o = o.substring(0,o.length-1);
 
+        if(o==""){
+            saas.util.BaseUtil.showToast('关联角色未选择，无法保存！')
+        }
+
         var _params = {
             accountId:Number(params['accountId']),
             roleIds:o,