Răsfoiți Sursa

删除表单中选择数据字典的功能

unknown 5 ani în urmă
părinte
comite
edc2daf1a8

+ 0 - 3
o2web/source/x_component_process_FormDesigner/Module/Form/form.html

@@ -85,9 +85,6 @@
         </table>
 <!--        <div class="MWFScriptIncluder" name="scripts"></div>-->
 
-        <div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;font-weight:bold;">预加载数据字典</div>
-        <div class="MWFDictionaryIncluder" name="includeDictionaries"></div>
-
 
 		<!--<div class="MWFArraylist" name="cssLinks" title="CSS引用"></div>-->
 		<!--<div class="MWFArraylist" name="scriptSrc" title="JS引用"></div>-->

+ 2 - 2
o2web/source/x_component_process_FormDesigner/Property.js

@@ -85,8 +85,8 @@ MWF.xApplication.process.FormDesigner.Property = MWF.FCProperty = new Class({
                     this.loadSidebarPosition();
                     this.loadViewFilter();
                     this.loadDocumentTempleteSelect();
-                    this.loadScriptIncluder();
-                    this.loadDictionaryIncluder();
+                    // this.loadScriptIncluder();
+                    // this.loadDictionaryIncluder();
                     //this.testRestful();
 //			this.loadScriptInput();
                     //MWF.process.widget.EventsEditor

+ 47 - 45
o2web/source/x_component_process_Xform/Form.js

@@ -217,16 +217,18 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
 
                 this.loadRelatedScript();
                 //this.loadResource( function () {
-                this.loadDictionaryList(function () {
-                    this.fireEvent("queryLoad");
-                    if (this.event_resolve) {
-                        this.event_resolve(function () {
-                            this.loadForm(callback)
-                        }.bind(this));
-                    } else {
-                        this.loadForm(callback);
-                    }
-                }.bind(this));
+                // this.loadDictionaryList(function () {
+
+                this.fireEvent("queryLoad");
+                if (this.event_resolve) {
+                    this.event_resolve(function () {
+                        this.loadForm(callback)
+                    }.bind(this));
+                } else {
+                    this.loadForm(callback);
+                }
+
+                // }.bind(this));
 
                 //}.bind(this));
 
@@ -258,41 +260,41 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({
     //     // this.loadScriptList( cb );
     //     this.loadDictionaryList( cb );
     // },
-    loadDictionaryList: function (callback) {
-        this.dictionaryLoaded = false;
-        var loadedCount = 0;
-        if (this.json.includeDictionaries && this.json.includeDictionaries.length) {
-            var fun = function () {
-                loadedCount++;
-                if (this.json.includeDictionaries.length <= loadedCount) {
-                    this.dictionaryLoaded = true;
-                    if (callback) callback();
-                }
-            }.bind(this);
-
-            this.json.includeDictionaries.map(function (d) {
-                var action = MWF.Actions.get(d.dictionary.appType === "cms" ? "x_cms_assemble_control" : "x_processplatform_assemble_surface");
-                if (d.path && d.path !== "root") {
-                    action["getDictData"](d.dictionary.id, d.dictionary.appId, d.path, function (json) {
-                        MWF.xScript.addDictToCache(d.dictionary, d.path, json.data);
-                        fun();
-                    }.bind(this), function () {
-                        fun();
-                    }.bind(this), true);
-                } else {
-                    action["getDictRoot"](d.dictionary.id, d.dictionary.appId, function (json) {
-                        MWF.xScript.addDictToCache(d.dictionary, d.path, json.data);
-                        fun();
-                    }.bind(this), function () {
-                        fun();
-                    }.bind(this), true);
-                }
-            }.bind(this));
-        } else {
-            this.dictionaryLoaded = true;
-            if (callback) callback();
-        }
-    },
+    // loadDictionaryList: function (callback) {
+    //     this.dictionaryLoaded = false;
+    //     var loadedCount = 0;
+    //     if (this.json.includeDictionaries && this.json.includeDictionaries.length) {
+    //         var fun = function () {
+    //             loadedCount++;
+    //             if (this.json.includeDictionaries.length <= loadedCount) {
+    //                 this.dictionaryLoaded = true;
+    //                 if (callback) callback();
+    //             }
+    //         }.bind(this);
+    //
+    //         this.json.includeDictionaries.map(function (d) {
+    //             var action = MWF.Actions.get(d.dictionary.appType === "cms" ? "x_cms_assemble_control" : "x_processplatform_assemble_surface");
+    //             if (d.path && d.path !== "root") {
+    //                 action["getDictData"](d.dictionary.id, d.dictionary.appId, d.path, function (json) {
+    //                     MWF.xScript.addDictToCache(d.dictionary, d.path, json.data);
+    //                     fun();
+    //                 }.bind(this), function () {
+    //                     fun();
+    //                 }.bind(this), true);
+    //             } else {
+    //                 action["getDictRoot"](d.dictionary.id, d.dictionary.appId, function (json) {
+    //                     MWF.xScript.addDictToCache(d.dictionary, d.path, json.data);
+    //                     fun();
+    //                 }.bind(this), function () {
+    //                     fun();
+    //                 }.bind(this), true);
+    //             }
+    //         }.bind(this));
+    //     } else {
+    //         this.dictionaryLoaded = true;
+    //         if (callback) callback();
+    //     }
+    // },
     // loadScriptList : function( callback ){
     //     var asyncList = [];
     //     var syncList = [];