Jelajahi Sumber

表单支持Promise

huqi 5 tahun lalu
induk
melakukan
c7a0a74f10

+ 2 - 2
o2web/gulpfile.js

@@ -602,7 +602,7 @@ gulp.task("cleanAll", getCleanTask('/'));
 
 gulp.task("o2:new-v:html", function () {
     var path = "x_desktop";
-    var src = 'source/x_desktop/*.html';
+    var src = options.dest + '/x_desktop/*.html';
     var dest = options.dest + '/x_desktop/';
     return gulp.src(src)
         .pipe(assetRev())
@@ -627,7 +627,7 @@ gulp.task("o2:new-v:html", function () {
 });
 gulp.task("o2:new-v:o2", function () {
     var path = "o2_core";
-    var src = 'source/o2_core/o2.js';
+    var src = options.dest + '/o2_core/o2.js';
     var dest = options.dest +'/o2_core/';
     return gulp.src(src)
         .pipe(assetRev())

+ 1 - 1
o2web/source/o2_core/o2/xDesktop/Actions/RestActions.js

@@ -94,7 +94,7 @@ MWF.xDesktop.Actions.RestActions = new Class({
             if (!option.success) option.success = function(v){return v;}.ag();
             if (option.success && !option.success.isAG) option.success = option.success.ag();
 
-            console.log(option.success)
+            //console.log(option.success)
 
             if (option.failure && option.failure.failure) option.failure = option.failure.failure;
             if (option.failure) {

File diff ditekan karena terlalu besar
+ 2 - 0
o2web/source/o2_lib/polyfill/polyfill.js


+ 5 - 1
o2web/source/x_component_process_Xform/$Input.js

@@ -183,6 +183,7 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
         return (this.json.defaultValue && this.json.defaultValue.code) ? this.form.Macro.exec(this.json.defaultValue.code, this): (value || "");
     },
 	getValue: function(){
+        debugger;
         if (this.moduleValueAG) return this.moduleValueAG;
         var value = this._getBusinessData();
         if (!value) value = this._computeValue();
@@ -196,7 +197,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class({
                 this.__setValue(v);
             }.bind(this));
         }else {
-            this.__setValue(value);
+            Promise.resolve(value).then(function(v){
+                this.__setValue(v);
+            }.bind(this));
+            //this.__setValue(value);
         }
 
     },

+ 1 - 0
o2web/source/x_desktop/index.html

@@ -66,6 +66,7 @@
         }
     </script>
 
+    <script src="../o2_lib/polyfill/polyfill.js"></script>
     <script src="../o2_core/o2.min.js"></script>
     <script src="js/base.min.js"></script>
     <script src="js/x.min.js"></script>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini