代码提交

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

@@ -120,6 +120,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         }
                     }
                 }
+                me.aftertrigger(me);
             }
             me.ownerCt.close();
         }

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

@@ -179,7 +179,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
             var count = f.store.getCount();
             var searchCount = false;//校验数据库是否有该字段
             var dbfinds = me.dbfinds;
-            if(count>0){
+            if(f.value&&f.value!=''){
                 //添加默认条件
                 var searchField = null;
                 var dbCondition = [];
@@ -221,7 +221,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                     failure: function(response, opts) {}
                 }); 
             }
-            if(!f.value||f.value==''||count==0||!searchCount){
+            if(!f.value||f.value==''||!searchCount){
                 if(dbfinds&&dbfinds.length>0){
                     if(me.belong=='grid'){
                         for (let index = 0; index < dbfinds.length; index++) {
@@ -283,10 +283,15 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                         }
                     }
                 }
+                me.aftertrigger(me);
             }
         }
     },
 
+    aftertrigger:function(f){
+        return true;
+    },
+
     getValue: function(f) {
         var me = this,val = me.rawToValue(me.processRawValue(me.getRawValue()));
         me.value = val;

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

@@ -173,7 +173,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
             var count = f.store.getCount();
             var searchCount = false;//校验数据库是否有该字段
             var dbfinds = me.dbfinds;
-            if(count>0){
+            if(f.value&&f.value!=''){
                 //添加默认条件
                 var searchField = null;
                 var dbCondition = [];
@@ -215,7 +215,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
                     failure: function(response, opts) {}
                 }); 
             }
-            if(!f.value||f.value==''||count==0||!searchCount){
+            if(!f.value||f.value==''||!searchCount){
                 if(dbfinds&&dbfinds.length>0){
                     if(me.belong=='grid'){
                         for (let index = 0; index < dbfinds.length; index++) {

frontend/saas-web/app/view/document/product/FormController.js

@@ -102,7 +102,8 @@ Ext.define('saas.view.document.product.FormController', {
                             allowBlank : true, 
                             width:260,
                             getCondition:function(v){
-                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%')";
+                                return "((wh_code) like '%"+v.toUpperCase()+"%' or (wh_description) like '%"+v.toUpperCase()+"%'"+
+                                " or (wh_type) like '%"+v.toUpperCase()+"%')";
                             }
                         }],
                         //窗口列设置

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

@@ -43,7 +43,7 @@ Ext.define('saas.view.sys.power.FormPanel', {
         layout:'fit',
         height:'100%',
         width: '85%',
-        xtype:'sys-power-treegrid'
+        xtype:'power-grid'
     }],
 
     initComponent: function () {

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

@@ -0,0 +1,162 @@
+/**
+ * Created by zhouy on 2018/11/8.
+ */
+Ext.define('saas.view.sys.power.GroupGrid', {
+    extend: 'Ext.grid.Panel',
+    requires: [
+      //  'Ext.selection.CellModel',
+        'saas.view.sys.power.OtherField'
+    ],
+    xtype: 'power-grid',
+    plugins: {
+        cellediting: {
+            clicksToEdit: 1
+        }
+    },
+    store:Ext.create('Ext.data.Store',{
+        fields:[
+            {name: 'query',type:'bool'},
+            {name: 'add', type: 'bool'},
+            {name: 'save', type: 'bool'},
+            {name: 'delete', type: 'bool'},
+            {name: 'audit', type: 'bool'},
+            {name: 'resAudit', type: 'bool'},
+            {name: 'import', type: 'bool'},
+            {name: 'export', type: 'bool'},
+            {name: 'others', calculate: function(data) {
+                var others = data['others'];
+                return others;
+            }}
+        ],
+        data: [{"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true},{"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':1,'text':'权限1','value':'true'}]},
+            {"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':100,'text':'权限2','value':true},{'resouceId':101,'text':'权限2.1','value':true}]},
+            {"query":true,"add":false,"delete":false,"audit":true,"resAudit":true,"import":true,"export":true,"others":[{'resouceId':1000,text:'权限3','value':true},{'resouceId':1001,'text':'权限3.1','value':true},{'resouceId':1002,'text':'权限1','value':true},{'resouceId':100,'text':'权限3.2','value':true}]}]
+}),
+    selModel:Ext.create('Ext.selection.CheckboxModel', {
+        checkOnly: true,
+        listeners: {
+            'select': function (selModel, record) {
+                selModel.view.ownerCt.selectAllPower(record);
+            },
+            'deselect': function (selModel, record) {
+                selModel.view.ownerCt.deselectAllPower(record);
+            }
+        }
+    }),
+    height: 350,
+    viewConfig: {
+     stripeRows: false,
+     enableTextSelection: false,
+     markDirty: false
+    },
+    trackMouseOver: false,
+    //disableSelection: true,
+    columns: [{
+        header: '查询',
+        dataIndex: 'query',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '新增',
+        dataIndex: 'add',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '修改',
+        dataIndex: 'save',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '删除',
+        dataIndex: 'delete',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '审核',
+        dataIndex: 'audit',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '反审核',
+        dataIndex: 'resAudit',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '导入',
+        dataIndex: 'import',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        header: '导出',
+        dataIndex: 'export',
+        xtype: 'checkcolumn',
+        headerCheckbox: true,
+        width: 90,
+        stopSelection: false
+    }, {
+        text: '其它',
+        width: 160,
+        dataIndex:'others',
+        xtype: 'widgetcolumn',
+        producesHTML: false,
+        widget: {
+            xtype: 'powerotherfield',
+            bind:'{record.others}'
+        }
+    }],
+
+    // Dispatch named listener and handler methods to this instance
+    defaultListenerScope: true,
+
+    listeners: {
+        columnshow: 'onColumnToggle',
+        columnhide: 'onColumnToggle'
+    },
+    selectAllPower: function(record){
+        var me = this;data={"query":true,"add":true,"save":true,"delete":true,"audit":true,"resAudit":true,"import":true,"export":true};
+        me.setAllOthers(record,true,data);
+
+    },
+    deselectAllPower:function(record){
+        var me = this;data={"query":false,"add":false,"save":false,"delete":false,"audit":false,"resAudit":false,"import":false,"export":false};
+        me.setAllOthers(record,false,data);
+    },
+    setAllOthers:function(record,bool,data){
+        var others=record.get('others');
+        Ext.Array.each(others,function(o){
+            o.value=bool;
+        })
+        data.others = others
+        record.set(data);
+    }
+}, function(WidgetGrid) {
+    /*var prototype = WidgetGrid.prototype,
+     columns = prototype.columns,
+     len = columns.length,
+     i,
+     tbar = prototype.tbar = [];
+
+     // Create tbar on the prototype with a button for each column
+     for (i = 0; i < len; i++) {
+     tbar.push({
+     text: columns[i].text,
+     enableToggle: true,
+     pressed: true,
+     toggleHandler: 'onButtonToggle'
+     });
+     }*/
+});

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

@@ -0,0 +1,33 @@
+/**
+ * Created by zhouy on 2018/11/8.
+ */
+Ext.define('saas.view.sys.power.OtherField', {
+    extend: 'Ext.form.FieldContainer',
+    //extend: 'Ext.form.field.Text',
+    alias: 'widget.powerotherfield',
+    layout: 'column',
+    defaults:{
+       xtype:'checkbox',
+       columnWidth:0.5
+    },
+    initComponent:function(){
+        var me=this;
+        me.callParent(arguments);
+    },
+    setHtml:function(v){
+        this.setItems(v);
+    },
+    setItems:function(v){
+        if(v){
+            var len = v.length,items=[];
+            if(this.items.length>0)this.removeAll(true);
+            for (i = 0; i < len; i++) {
+                items.push({
+                   boxLabel:v[i].text,
+                   checked:v[i].value
+                });
+            }
+            this.add(items);
+        }
+    }
+});

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

@@ -1,41 +0,0 @@
-Ext.define('saas.view.sys.power.TreeGrid', {
-    extend: 'Ext.tree.Panel',
-    xtype: 'sys-power-treegrid',
-
-    multiSelect: true,
-    singleExpand: true,
-
-    store: {
-        type: 'tree',
-        folderSort: true,
-    },
-
-    columns: [{
-        xtype: 'treecolumn', //this is so we know which column will show the tree
-        header: '模块',
-        dataIndex: 'task',
-        flex: 1,
-        sortable: true
-    }, {
-        header: '保存',
-        dataIndex: 'duration',
-        flex: 1,
-        sortable: true,
-        align: 'center',
-        xtype: 'checkcolumn',
-        formatter: 'this.formatHours'
-    },{
-        header: '提交',
-        dataIndex: 'user',
-        flex: 1,
-        xtype: 'checkcolumn',
-        sortable: true
-    }, {
-        xtype: 'checkcolumn',
-        header: '其他',
-        dataIndex: 'done',
-        width: 155,
-        stopSelection: false,
-        menuDisabled: true
-    }]
-});