瀏覽代碼

Merge branch 'fix/Selector.type_execption' into 'wrdp'

Merge of fix/Selector.type_execption 修复复合选人可能存在的问题 to wrdp

See merge request o2oa/o2oa!2371
蔡祥熠 5 年之前
父節點
當前提交
3c6f83fac6
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 3 2
      o2web/source/x_component_Selector/MultipleSelector.js
  2. 3 3
      package.json

+ 3 - 2
o2web/source/x_component_Selector/MultipleSelector.js

@@ -649,9 +649,10 @@ MWF.xApplication.Selector.MultipleSelector = new Class({
     },
     getValueByType : function( values, type ){
         var result = [];
-        values = typeOf( values == "array" ) ?  values : [values];
-        var types = typeOf( type == "array" ) ?  type : [type];
+        values = typeOf(values) == "array" ?  values : [values];
+        var types = typeOf(type)== "array"  ?  type : [type];
         values.each( function( data ){
+            if( !data )return;
             if( typeOf( data ) == "string" ){
                 var dn = data;
             }else{

+ 3 - 3
package.json

@@ -56,21 +56,21 @@
                 "fast-glob": "^3.2.2",
                 "gulp": "^4.0.2",
                 "gulp-changed": "^3.2.0",
+                "gulp-concat": "^2.6.1",
                 "gulp-deleted": "^1.0.0",
                 "gulp-if": "^2.0.2",
                 "gulp-logger": "0.0.2",
                 "gulp-rename": "^1.4.0",
                 "gulp-shell": "^0.8.0",
+                "gulp-sourcemaps": "^3.0.0",
                 "gulp-tm-asset-rev": "0.0.16",
                 "gulp-tm-uglify": "3.0.1",
                 "gulp-uglify-es": "^2.0.0",
                 "gulp-util": "^3.0.8",
-                "gulp-concat": "^2.6.1",
                 "minimist": "^1.2.0",
                 "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"
         }
 }