From 8c97372348227d161e7f7a626e1930c89b9c66a3 Mon Sep 17 00:00:00 2001 From: Edward Date: Wed, 6 May 2015 17:51:23 +0800 Subject: [PATCH] resources/Editors/Editor.Roo.LayoutDialog.bjs resources/Editors/Editor.Roo.LayoutDialog.js --- resources/Editors/Editor.Roo.LayoutDialog.bjs | 2 +- resources/Editors/Editor.Roo.LayoutDialog.js | 163 +----------------- 2 files changed, 3 insertions(+), 162 deletions(-) diff --git a/resources/Editors/Editor.Roo.LayoutDialog.bjs b/resources/Editors/Editor.Roo.LayoutDialog.bjs index 6db8c10b2..ec6b923f9 100644 --- a/resources/Editors/Editor.Roo.LayoutDialog.bjs +++ b/resources/Editors/Editor.Roo.LayoutDialog.bjs @@ -82,7 +82,7 @@ }, { "listeners" : { - "click" : "function (_self, e)\n{\n Roo.log(_this.ftype_combo);\n var data = { \n \"manage_scale_id\": {\n \"Field\": \"manage_scale_id\",\n \"Type\": \"int(11)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0\",\n \"Extra\": null,\n \"relates_to_table\": \"core_enum\",\n \"relates_to_col\": \"id\",\n \"relates_to_schema\": {\n \"id\": {\n \"Field\": \"id\",\n \"Type\": \"int(11)\",\n \"Null\": \"NO\",\n \"Key\": \"PRI\",\n \"Default\": null,\n \"Extra\": \"auto_increment\"\n },\n \"etype\": {\n \"Field\": \"etype\",\n \"Type\": \"varchar(32)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"name\": {\n \"Field\": \"name\",\n \"Type\": \"varchar(255)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"active\": {\n \"Field\": \"active\",\n \"Type\": \"int(2)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"1\",\n \"Extra\": null\n },\n \"seqid\": {\n \"Field\": \"seqid\",\n \"Type\": \"int(11)\",\n \"Null\": \"NO\",\n \"Key\": \"MUL\",\n \"Default\": \"0\",\n \"Extra\": null\n },\n \"seqmax\": {\n \"Field\": \"seqmax\",\n \"Type\": \"int(11)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0\",\n \"Extra\": null\n },\n \"display_name\": {\n \"Field\": \"display_name\",\n \"Type\": \"text\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"is_system_enum\": {\n \"Field\": \"is_system_enum\",\n \"Type\": \"int(2)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0\",\n \"Extra\": null\n }\n }\n },\n \"person_type\": {\n \"Field\": \"person_type\",\n \"Type\": \"text\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"employer_name\": {\n \"Field\": \"employer_name\",\n \"Type\": \"text\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"birth_date\": {\n \"Field\": \"birth_date\",\n \"Type\": \"date\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0000-00-00\",\n \"Extra\": null\n },\n \"employ_start_date\": {\n \"Field\": \"employ_start_date\",\n \"Type\": \"date\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0000-00-00\",\n \"Extra\": null\n },\n \"employ_end_date\": {\n \"Field\": \"employ_end_date\",\n \"Type\": \"date\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0000-00-00\",\n \"Extra\": null\n },\n \"hide_same_employer\": {\n \"Field\": \"hide_same_employer\",\n \"Type\": \"int(4)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0\",\n \"Extra\": null\n },\n \"salary_currency\": {\n \"Field\": \"salary_currency\",\n \"Type\": \"varchar(256)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"quota_currency\": {\n \"Field\": \"quota_currency\",\n \"Type\": \"varchar(256)\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": null,\n \"Extra\": null\n },\n \"created_dt\": {\n \"Field\": \"created_dt\",\n \"Type\": \"datetime\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0000-00-00 00:00:00\",\n \"Extra\": null\n },\n \"updated_dt\": {\n \"Field\": \"updated_dt\",\n \"Type\": \"datetime\",\n \"Null\": \"NO\",\n \"Key\": null,\n \"Default\": \"0000-00-00 00:00:00\",\n \"Extra\": null\n }\n };\n \n Roo.log('debuging...');\n _this.panel.loadData(data);\n\n}" + "click" : "function (_self, e)\n{\n \n Roo.log('Converting to JSON...');\n _this.panel.toJson();\n\n}" }, "xtype" : "Button", "String text" : "To JSON", diff --git a/resources/Editors/Editor.Roo.LayoutDialog.js b/resources/Editors/Editor.Roo.LayoutDialog.js index c256636a3..0432b9d32 100644 --- a/resources/Editors/Editor.Roo.LayoutDialog.js +++ b/resources/Editors/Editor.Roo.LayoutDialog.js @@ -255,168 +255,9 @@ Editor.Roo.LayoutDialog = new Roo.XComponent({ listeners : { click : function (_self, e) { - Roo.log(_this.ftype_combo); - var data = { - "manage_scale_id": { - "Field": "manage_scale_id", - "Type": "int(11)", - "Null": "NO", - "Key": null, - "Default": "0", - "Extra": null, - "relates_to_table": "core_enum", - "relates_to_col": "id", - "relates_to_schema": { - "id": { - "Field": "id", - "Type": "int(11)", - "Null": "NO", - "Key": "PRI", - "Default": null, - "Extra": "auto_increment" - }, - "etype": { - "Field": "etype", - "Type": "varchar(32)", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "name": { - "Field": "name", - "Type": "varchar(255)", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "active": { - "Field": "active", - "Type": "int(2)", - "Null": "NO", - "Key": null, - "Default": "1", - "Extra": null - }, - "seqid": { - "Field": "seqid", - "Type": "int(11)", - "Null": "NO", - "Key": "MUL", - "Default": "0", - "Extra": null - }, - "seqmax": { - "Field": "seqmax", - "Type": "int(11)", - "Null": "NO", - "Key": null, - "Default": "0", - "Extra": null - }, - "display_name": { - "Field": "display_name", - "Type": "text", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "is_system_enum": { - "Field": "is_system_enum", - "Type": "int(2)", - "Null": "NO", - "Key": null, - "Default": "0", - "Extra": null - } - } - }, - "person_type": { - "Field": "person_type", - "Type": "text", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "employer_name": { - "Field": "employer_name", - "Type": "text", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "birth_date": { - "Field": "birth_date", - "Type": "date", - "Null": "NO", - "Key": null, - "Default": "0000-00-00", - "Extra": null - }, - "employ_start_date": { - "Field": "employ_start_date", - "Type": "date", - "Null": "NO", - "Key": null, - "Default": "0000-00-00", - "Extra": null - }, - "employ_end_date": { - "Field": "employ_end_date", - "Type": "date", - "Null": "NO", - "Key": null, - "Default": "0000-00-00", - "Extra": null - }, - "hide_same_employer": { - "Field": "hide_same_employer", - "Type": "int(4)", - "Null": "NO", - "Key": null, - "Default": "0", - "Extra": null - }, - "salary_currency": { - "Field": "salary_currency", - "Type": "varchar(256)", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "quota_currency": { - "Field": "quota_currency", - "Type": "varchar(256)", - "Null": "NO", - "Key": null, - "Default": null, - "Extra": null - }, - "created_dt": { - "Field": "created_dt", - "Type": "datetime", - "Null": "NO", - "Key": null, - "Default": "0000-00-00 00:00:00", - "Extra": null - }, - "updated_dt": { - "Field": "updated_dt", - "Type": "datetime", - "Null": "NO", - "Key": null, - "Default": "0000-00-00 00:00:00", - "Extra": null - } - }; - Roo.log('debuging...'); - _this.panel.loadData(data); + Roo.log('Converting to JSON...'); + _this.panel.toJson(); } } -- 2.39.2