代码提交

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -256,7 +256,11 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                                     field.setValue(null);
                                     field.lastTriggerValue=null;
                                 }else{
-                                    field.setValue(null);
+                                    if(field.xtype.indexOf('hidden')>-1){
+                                        field.setValue(0);
+                                    }else{
+                                        field.setValue(null);
+                                    }
                                 }    
                             }
                         }

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -199,7 +199,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 if(data.id){
                                     var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=SignetPhoto]');
-                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath.http + '/api/file/download?path='+data.fullPath;
                                     var showSignetPhoto = form.down('[name=showSignetPhoto]');
                                     showSignetPhoto.show();
                                 }
@@ -325,7 +325,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
                                 if(data.id){
                                     var serverOptions = Ext.manifest.server;
                                     var img = myForm.down('[name=LogoPhoto]');
-                                    img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+data.fullPath;
+                                    img.el.dom.src = serverOptions.basePath.http + '/api/file/download?path='+data.fullPath;
                                     var showLogoPhoto = form.down('[name=showLogoPhoto]');
                                     showLogoPhoto.show();
                                 }
@@ -414,7 +414,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var signet = form.down('[name=signet]').value;
         if(signet&&signet!=''){
             var img = form.down('[name=SignetPhoto]');
-            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+signet;
+            img.el.dom.src = serverOptions.basePath.http + '/api/file/download?path='+signet;
             var showSignetPhoto = form.down('[name=showSignetPhoto]');
             showSignetPhoto.show();
         }
@@ -422,7 +422,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
         var logoUrl = form.down('[name=logoUrl]').value;
         if(logoUrl&&logoUrl!=''){
             var img = form.down('[name=LogoPhoto]');
-            img.el.dom.src = serverOptions.basePath + '/api/file/download?path='+logoUrl;
+            img.el.dom.src = serverOptions.basePath.http + '/api/file/download?path='+logoUrl;
             var showLogoPhoto = form.down('[name=showLogoPhoto]');
             showLogoPhoto.show();
         }
@@ -472,7 +472,7 @@ Ext.define('saas.view.sys.config.FormPanel', {
 
     downLoad:function(path){
         var serverOptions = Ext.manifest.server;
-        window.location.href = serverOptions.basePath + '/api/file/download?path='+path;
+        window.location.href = serverOptions.basePath.http + '/api/file/download?path='+path;
         //ajax 响应下载必须要创建一个form实例
         // if (!Ext.fly('ext-attach-download')) {  
 		// 	var frm = document.createElement('form');  

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -20,7 +20,14 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         expandTip:null,
 		showSummaryRow: false,
         startCollapsed: false,
-        groupHeaderTpl: '{name}'+'模块'
+        groupHeaderTpl: Ext.create('Ext.XTemplate',
+            '<div>{rows:this.formatName}</div>',
+            {
+                formatName: function(name) {
+                    return name[0].data.moduleName+'模块';
+                }
+            }
+        )
 	})],
     initId:0,
     dataUrl:'/api/account/role/power/resource',
@@ -43,313 +50,127 @@ Ext.define('saas.view.sys.power.GroupGrid', {
      markDirty: false
     },
     trackMouseOver: false,
-    columns: [{
-        header: '单据名称',
-        dataIndex: 'groupName',
-        xtype: '',
-        flex: 2,
-        stopSelection: false,
-        menuDisabled:true,
-    },{
-        header: '查询',
-        dataIndex: 'query',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('query');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('query',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '保存',
-        dataIndex: 'add',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('add');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('add',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    },{
-        header: '启用/关闭',
-        dataIndex: 'update',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1.5,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('update');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
+    columns: {
+        defaults:{
+            onTitleElClick:function(a,b,c,d){
+                var me = this;
+                var dataIndex = this.dataIndex;
+                var records = me.ownerCt.ownerCt.store.data.items;
+                var isAllCheck = true;
+                Ext.Array.each(records,function(rec){
+                    var data = rec.get(dataIndex);
+                    if(data!=null&&(typeof data)=='boolean'){
+                        if(!data){
                             isAllCheck = false
                         }
                     }
-                    rec.set('update',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '删除',
-        dataIndex: 'delete',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('delete');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
+                });
+                Ext.Array.each(records,function(rec){
+                    var data = rec.get(dataIndex);
+                    if(data!=null&&(typeof data)=='boolean'){
+                        if(data!=!isAllCheck){
+                            rec.set(dataIndex,!isAllCheck)
                         }
                     }
-                    rec.set('delete',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '审核',
-        dataIndex: 'audit',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('audit');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('audit',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '反审核',
-        dataIndex: 'unAudit',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('unAudit');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('unAudit',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '导入',
-        dataIndex: 'fileImport',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('fileImport');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('fileImport',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
-            }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '导出',
-        dataIndex: 'fileExport',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('fileExport');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('fileExport',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
+                });
+                me.setHeaderStatus(!isAllCheck);
+            },
+            doUpdateHeaderState: function(e) {
+                return true;
             }
         },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    }, {
-        header: '打印',
-        dataIndex: 'print',
-        xtype: 'checkcolumn',
-        headerCheckbox: true,
-        menuDisabled:true,
-        flex: 1,
-        stopSelection: false,
-        onTitleElClick:function(a,b,c,d){
-            var me = this;
-            var records = me.ownerCt.ownerCt.store.data.items;
-            var first = 'null',isAllCheck = true;
-            Ext.Array.each(records,function(rec){
-                var data = rec.get('print');
-                if(data!=null&&(typeof data)=='boolean'){
-                    if(first=='null'){
-                        first = data;
-                    }else{
-                        if(first!=data){
-                            isAllCheck = false
-                        }
-                    }
-                    rec.set('print',!data)
-                }
-            });
-            if(isAllCheck){
-                me.setHeaderStatus(!first)
+        items:[{
+            header: '单据名称',
+            dataIndex: 'groupName',
+            xtype: '',
+            flex: 2,
+            stopSelection: false,
+            menuDisabled:true,
+        },{
+            header: '查询',
+            dataIndex: 'query',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '保存',
+            dataIndex: 'add',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        },{
+            header: '启用/关闭',
+            dataIndex: 'update',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1.5,
+            stopSelection: false,
+        }, {
+            header: '删除',
+            dataIndex: 'delete',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '审核',
+            dataIndex: 'audit',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '反审核',
+            dataIndex: 'unAudit',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '导入',
+            dataIndex: 'fileImport',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '导出',
+            dataIndex: 'fileExport',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        }, {
+            header: '打印',
+            dataIndex: 'print',
+            xtype: 'checkcolumn',
+            headerCheckbox: true,
+            menuDisabled:true,
+            flex: 1,
+            stopSelection: false,
+        },{
+            text: '其它',
+            flex: 2.7,
+            dataIndex:'other',
+            xtype: 'widgetcolumn',
+            menuDisabled:true,
+            producesHTML: false,
+            widget: {
+                xtype: 'powerotherfield',
+                bind:'{record.other}'
             }
-        },
-        doUpdateHeaderState: function(e) {
-            return true;
-        }
-    },{
-        text: '其它',
-        flex: 2.7,
-        dataIndex:'other',
-        xtype: 'widgetcolumn',
-        menuDisabled:true,
-        producesHTML: false,
-        widget: {
-            xtype: 'powerotherfield',
-            bind:'{record.other}'
-        }
-    }],
+        }]
+    },
 
     initComponent: function () {
         var me = this;
@@ -357,6 +178,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         me.store = Ext.create('Ext.data.Store',{
             fields:[
                 {name: 'groupId',type:'int'},
+                {name: 'moduleId',type:'int'},
                 {name: 'groupName',type:'string'},
                 {name: 'moduleName',type:'string'},
                 {name: 'add'},
@@ -376,7 +198,9 @@ Ext.define('saas.view.sys.power.GroupGrid', {
                     return other;
                 }}
             ],
-            groupField:'moduleName',
+            groupDir:'ASC',
+            groupField:'moduleId',
+            clearRemovedOnLoad : true,
             proxy: {
                 timeout:8000,
                 type: 'ajax',

frontend/saas-web/app/view/sys/power/OtherField.js

@@ -2,19 +2,16 @@
  * Created by zhouy on 2018/11/8.
  */
 Ext.define('saas.view.sys.power.OtherField', {
-    extend: 'Ext.form.FieldContainer',
+    extend: 'Ext.form.CheckboxGroup',
     //extend: 'Ext.form.field.Text',
     alias: 'widget.powerotherfield',
-    layout: 'column',
-    defaults:{
-       xtype:'checkbox',
-       columnWidth:1
-    },
+    columns: 1,
+    vertical: true,
     initComponent:function(){
         var me=this;
         me.callParent(arguments);
     },
-    setHtml:function(v){
+    setValue:function(v){
         this.setItems(v);
     },
     setItems:function(v){