فهرست منبع

脚本搜索功能

huqi 5 سال پیش
والد
کامیت
9113662e5f

+ 6 - 2
o2web/package.json

@@ -35,12 +35,16 @@
     "gulp-if": "^2.0.2",
     "gulp-rename": "^1.4.0",
     "gulp-sftp-up4": "^0.1.8",
+    "gulp-sourcemaps": "^3.0.0",
     "gulp-tm-asset-rev": "0.0.16",
     "gulp-tm-uglify": "3.0.1",
     "gulp-uglify-es": "^2.0.0",
+    "jasmine-core": "^3.6.0",
+    "karma": "^5.2.3",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-jasmine": "^4.0.1",
     "merge-stream": "^1.0.1",
     "minimist": "^1.2.0",
-    "readline-sync": "^1.4.10",
-    "gulp-sourcemaps": "^3.0.0"
+    "readline-sync": "^1.4.10"
   }
 }

+ 1 - 0
o2web/source/x_component_FindDesigner/$Main/default/style.css

@@ -15,6 +15,7 @@
 }
 .o2_findDesigner_listNode {
     min-height: 300px;
+    background-color: #ffffff;
 }
 .o2_findDesigner_previewNode {
     min-height: 300px;

+ 5 - 1
o2web/source/x_component_FindDesigner/$Main/default/view.html

@@ -4,7 +4,11 @@
     <div class="o2_findDesigner_rangeNode" data-o2-element="rangeNode" data-o2-events=""></div>
     <div class="o2_findDesigner_resultNode" data-o2-element="resultNode" data-o2-events="">
         <div class="o2_findDesigner_listNode" data-o2-element="listNode" data-o2-events=""></div>
-        <div class="o2_findDesigner_previewNode" data-o2-element="previewNode" data-o2-events=""></div>
+        <div class="o2_findDesigner_previewNode" data-o2-element="previewNode" data-o2-events="">
+            <div class="o2_findDesigner_previewNode_separator" data-o2-element="previewSeparatorNode" data-o2-events=""></div>
+            <div class="o2_findDesigner_previewNode_title" data-o2-element="previewTitleNode" data-o2-events=""></div>
+            <div class="o2_findDesigner_previewNode_content" data-o2-element="previewContentNode" data-o2-events=""></div>
+        </div>
     </div>
 
 </div>

+ 9 - 1
o2web/source/x_component_process_Xform/Org.js

@@ -453,7 +453,15 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg =  new Class({
             //this._setBusinessData(values);
             this.validationMode();
             this.validation();
-            this.fireEvent("select");
+            var p = this.getValue();
+            if (p.then){
+                p.then(function(){
+                    this.fireEvent("select");
+                }.bind(this), function(){});
+            }else{
+                this.fireEvent("select");
+            }
+
         }.bind(this))
     },
     selectOnCancel: function(){

+ 1 - 2
package.json

@@ -72,7 +72,6 @@
                 "progress-stream": "^2.0.0",
                 "request": "^2.88.2",
                 "single-line-log": "^1.1.2",
-                "targz": "^1.0.1",
-                "gulp-sourcemaps": "^3.0.0"
+                "targz": "^1.0.1"
         }
 }