Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-11-21 c02e430f16cb51cabb6f4b24f99ec48efc7b0596

 gx_tieta/WebRoot/js/whyc-jqueryui.js

@@ -587,7 +587,12 @@
      if(isString(options)) {

         var oldOpts = this.data('testVal');

         opts = $.extend({}, opts, oldOpts);

         opts[attr] = val;

         if(attr == 'allOpts') {

            opts = $.extend({}, opts, val);

         }else {

            opts[attr] = val;

         }

			
      }else if(isObject(options)){

         opts = $.extend(true, {}, defaults, options||{});

      }