yuliang 3 lat temu
rodzic
commit
2fdcc43bcd

+ 2 - 0
src/Defaults.ts

@@ -58,6 +58,8 @@ export const tbseparator = {}
 
 export const button = {}
 
+export const panel = {}
+
 export const splitter = {}
 
 export const maintab = {}

+ 3 - 3
src/controls/base.ts

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 
-type DragType = 'row-container' | 'col-container' | 'col-item' | 'row-item'
+type DragType = 'rows-container' | 'cols-container' | 'col-item' | 'row-item'
 
 /**
  * 构建所有组件的公共属性
@@ -17,7 +17,7 @@ export function baseConfig(config, dragType?: DragType) {
 
         let cc = ''
         switch (dragType) {
-            case "col-container":
+            case "cols-container":
                 cc = 'design_cols_container'
                 break
 
@@ -25,7 +25,7 @@ export function baseConfig(config, dragType?: DragType) {
                 cc = 'design_col_item'
                 break
 
-            case "row-container":
+            case "rows-container":
                 cc = 'design_rows_container'
                 break
 

+ 1 - 1
src/controls/cols.js

@@ -15,7 +15,7 @@ export default function () {
                 layout: 'hbox',
                 minHeight: config.designMode ? 32 : 0
 
-            }, baseConfig(config, 'col-container'), config, cols)
+            }, baseConfig(config, 'cols-container'), config, cols)
 
             this.superclass.constructor.call(self, newConfig)
         },

+ 16 - 0
src/controls/panel.js

@@ -0,0 +1,16 @@
+import _ from 'lodash'
+import {baseConfig} from "./base";
+import {panel} from "../Defaults";
+
+export default function () {
+    /**
+     *
+     */
+    const ct = Ext.panel.Panel.prototype.constructor
+    Ext.panel.Panel.override({
+        constructor: function (config) {
+            const newConfig = _.defaultsDeep({}, config, baseConfig(config, "rows-container"), panel)
+            ct.call(this, newConfig)
+        }
+    });
+}

+ 1 - 1
src/controls/rows.js

@@ -18,7 +18,7 @@ export default function () {
                     margin: '0 0 5 0',
                 },
 
-            }, baseConfig(config, 'row-container'), config, rows)
+            }, baseConfig(config, 'rows-container'), config, rows)
 
             this.superclass.constructor.call(self, newConfig)
         },

+ 1 - 1
src/controls/toolbar/toolbar.js

@@ -14,7 +14,7 @@ export default function () {
         constructor: function (config) {
             const newConfig = _.defaultsDeep({
                 // 强制性属性
-            }, baseConfig(config, 'row-item'), config, toolbar)
+            }, baseConfig(config, 'cols-container'), config, toolbar)
 
             ct.call(this, newConfig)
         }

+ 2 - 0
src/init.ts

@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import initMainTab from './controls/MainTab'
+import initPanel from './controls/panel'
 import initGrid from './controls/grid'
 import initTextfield from './controls/input/textfield'
 import initToolbar from './controls/toolbar/toolbar'
@@ -78,6 +79,7 @@ export function init() {
         _doAddListener.call(this, ename, fn, scope, options, order, caller, manager)
     }
 
+    initPanel()
     initGrid()
     initMainTab()
     initTextfield()