cloud-web-corejs 1.0.54-dev.124 → 1.0.54-dev.125

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.124",
+  "version": "1.0.54-dev.125",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/advancedSearchDialog/mixins.js

@@ -1,4 +1,31 @@
 /**version-1.0*/
 let tmixins = {};
-function _0x3944(){var _0x491c59=["qMcp7WISPWy8RW4oCg".split("").reverse().join(""),"\u0057\u0036\u0076\u0055\u0063\u0033\u0046\u0063\u0054\u0071\u0056\u0063\u004b\u0053\u006f\u004f\u0064\u0053\u006b\u0057\u0057\u0037\u0047\u0054\u0063\u0071","HkSQc37WTkCNdN7WEWdA".split("").reverse().join(""),"ugBIfwAZLMD".split("").reverse().join(""),"LXMyHL2CPzNoLrxyKbxD".split("").reverse().join(""),"a1DVHNzqbZn4Cto".split("").reverse().join(""),"WDijNqhLho".split("").reverse().join(""),"\u006e\u0064\u0061\u0059\u006d\u0074\u0043\u0058\u006d\u004b\u0031\u0072\u0044\u0065\u004c\u0033\u0045\u0071","YkCQc7PWtmXNdBQWnv5W".split("").reverse().join(""),"qqOiQWNomVdxRWkoSk".split("").reverse().join(""),"hL3sJfus2admWytm".split("").reverse().join(""),"aLd/6WqX6WvkmHcR4WHz0McV7WyuPW".split("").reverse().join(""),"WTchLRcxRWKz3xdkmCEk8AOz6W".split("").reverse().join(""),"0RWwmPWKkSd".split("").reverse().join(""),"\u0043\u0032\u006e\u0056\u0043\u0067\u0076\u0065\u0079\u0078\u0072\u0048","\u006d\u0074\u0071\u0034\u006d\u004a\u0069\u0032\u006d\u004e\u004c\u0074\u0076\u0066\u0062\u006f\u0044\u0071","ytIcxQWmadw7PZvFomIc/6WToCId/4W".split("").reverse().join(""),"Hrxye1MCVzMoLrxyKbxD".split("").reverse().join(""),"\u0057\u0050\u0078\u0063\u0051\u0038\u006f\u007a\u0057\u0036\u0037\u0064\u0055\u0061","\u0057\u0036\u0042\u0063\u0054\u006d\u006f\u0078\u0071\u0038\u006b\u0073\u0057\u0051\u006e\u0077\u0078\u0047","qxATvgj".split("").reverse().join(""),'W5JdQrqeea',"\u0041\u004d\u0072\u0077\u0073\u0068\u0043","\u0057\u0050\u0072\u0057\u0057\u0052\u0066\u0032\u0057\u0036\u004e\u0064\u0056\u0053\u006b\u0057\u0057\u0035\u0075","OGlmvae".split("").reverse().join(""),"uRWY05WyGqGdJrcWv6WfoSOdBRW".split("").reverse().join(""),"aQdJRWpk8CEk8Vd/OWYzQW".split("").reverse().join(""),"\u006d\u0074\u0072\u004f\u0073\u004d\u0066\u006b\u0041\u004e\u0061","\u0069\u0053\u006f\u0064\u0057\u0050\u0033\u0063\u0054\u0038\u006b\u0046\u0057\u0037\u0062\u0043","GMz1j1zbLZm".split("").reverse().join(""),'mZu2odu3mdvLthPACMC','CMD0W6KJWQ7dPSo2',"\u0079\u0032\u0039\u0055\u007a\u004d\u004c\u0059\u0042\u0071","aMchfUdxQWg57WFrxd".split("").reverse().join(""),"\u0074\u0075\u0056\u0063\u0056\u0076\u0056\u0063\u0051\u0043\u006b\u0077","QacyX1ajmkmJd7RW5k8JcVOW".split("").reverse().join(""),"\u0057\u0050\u0043\u0041\u0057\u0037\u0068\u0063\u004e\u0075\u0072\u0048\u0057\u0034\u0033\u0063\u0050\u006d\u006b\u0061\u0057\u0037\u0066\u0057\u0057\u0034\u0042\u0064\u0051\u0071","\u006d\u004a\u0043\u0030\u006d\u0064\u0047\u0031\u006e\u0065\u0050\u0054\u0072\u0078\u0044\u0058\u0079\u0057"];_0x3944=function(){return _0x491c59;};return _0x3944();}function _0x2b16df(_0x3770b8,_0x57d42d,_0x84f22e,_0x448803,_0x11046f){return _0x13ec(_0x448803- -0x378,_0x11046f);}function _0x13ec(_0x5a1857,_0x394446){var _0x13ecd7=_0x3944();_0x13ec=function(_0x399525,_0x5ed43f){_0x399525=_0x399525-0x0;var _0x1a550c=_0x13ecd7[_0x399525];if(_0x13ec['fqfYyW']===undefined){var _0x31b59c=function(_0x2fac5b){var _0xb45678="\u0061\u0062\u0063\u0064\u0065\u0066\u0067\u0068\u0069\u006a\u006b\u006c\u006d\u006e\u006f\u0070\u0071\u0072\u0073\u0074\u0075\u0076\u0077\u0078\u0079\u007a\u0041\u0042\u0043\u0044\u0045\u0046\u0047\u0048\u0049\u004a\u004b\u004c\u004d\u004e\u004f\u0050\u0051\u0052\u0053\u0054\u0055\u0056\u0057\u0058\u0059\u005a\u0030\u0031\u0032\u0033\u0034\u0035\u0036\u0037\u0038\u0039\u002b\u002f\u003d";var _0x2d7407="";var _0x336053="".split("").reverse().join("");for(var _0x49edc3=0x0,_0x678cc9,_0x4e647e,_0x3c6316=0x0;_0x4e647e=_0x2fac5b["\u0063\u0068\u0061\u0072\u0041\u0074"](_0x3c6316++);~_0x4e647e&&(_0x678cc9=_0x49edc3%0x4?_0x678cc9*0x40+_0x4e647e:_0x4e647e,_0x49edc3++%0x4)?_0x2d7407+=String['fromCharCode'](0xff&_0x678cc9>>(-0x2*_0x49edc3&0x6)):0x0){_0x4e647e=_0xb45678['indexOf'](_0x4e647e);}for(var _0x2eaca8=0x0,_0x292363=_0x2d7407["\u006c\u0065\u006e\u0067\u0074\u0068"];_0x2eaca8<_0x292363;_0x2eaca8++){_0x336053+="\u0025"+("00".split("").reverse().join("")+_0x2d7407["\u0063\u0068\u0061\u0072\u0043\u006f\u0064\u0065\u0041\u0074"](_0x2eaca8)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x336053);};_0x13ec["\u0054\u0073\u0042\u0062\u004f\u006d"]=_0x31b59c;_0x5a1857=arguments;_0x13ec['fqfYyW']=!![];}var _0x3e4080=_0x13ecd7[0x0];var _0x2379dd=_0x399525+_0x3e4080;var _0x244f97=_0x5a1857[_0x2379dd];if(!_0x244f97){_0x1a550c=_0x13ec['TsBbOm'](_0x1a550c);_0x5a1857[_0x2379dd]=_0x1a550c;}else{_0x1a550c=_0x244f97;}return _0x1a550c;};return _0x13ec(_0x5a1857,_0x394446);}function _0x5be146(_0x203c64,_0x4bf9ad,_0x4529ae,_0x4073ca,_0x2aa7a1){return _0x244f(_0x4073ca- -0x90,_0x4529ae);}function _0x244f(_0x5a1857,_0x394446){var _0x13ecd7=_0x3944();_0x244f=function(_0x399525,_0x5ed43f){_0x399525=_0x399525-0x0;var _0x1a550c=_0x13ecd7[_0x399525];if(_0x244f["\u0042\u0042\u0068\u0072\u0069\u0043"]===undefined){var _0x31b59c=function(_0xb45678){var _0x2d7407="=/+9876543210ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba".split("").reverse().join("");var _0x336053='';var _0x49edc3='';for(var _0x678cc9=0x0,_0x4e647e,_0x3c6316,_0x2eaca8=0x0;_0x3c6316=_0xb45678['charAt'](_0x2eaca8++);~_0x3c6316&&(_0x4e647e=_0x678cc9%0x4?_0x4e647e*0x40+_0x3c6316:_0x3c6316,_0x678cc9++%0x4)?_0x336053+=String["\u0066\u0072\u006f\u006d\u0043\u0068\u0061\u0072\u0043\u006f\u0064\u0065"](0xff&_0x4e647e>>(-0x2*_0x678cc9&0x6)):0x0){_0x3c6316=_0x2d7407['indexOf'](_0x3c6316);}for(var _0x292363=0x0,_0x1edce8=_0x336053['length'];_0x292363<_0x1edce8;_0x292363++){_0x49edc3+="\u0025"+('00'+_0x336053["\u0063\u0068\u0061\u0072\u0043\u006f\u0064\u0065\u0041\u0074"](_0x292363)["\u0074\u006f\u0053\u0074\u0072\u0069\u006e\u0067"](0x10))["\u0073\u006c\u0069\u0063\u0065"](-0x2);}return decodeURIComponent(_0x49edc3);};var _0x2fac5b=function(_0x400c20,_0x136427){var _0x5a3ef6=[],_0x2c1ff7=0x0,_0x502915,_0x5c54b6='';_0x400c20=_0x31b59c(_0x400c20);var _0x448fc7;for(_0x448fc7=0x0;_0x448fc7<0x100;_0x448fc7++){_0x5a3ef6[_0x448fc7]=_0x448fc7;}for(_0x448fc7=0x0;_0x448fc7<0x100;_0x448fc7++){_0x2c1ff7=(_0x2c1ff7+_0x5a3ef6[_0x448fc7]+_0x136427['charCodeAt'](_0x448fc7%_0x136427["\u006c\u0065\u006e\u0067\u0074\u0068"]))%0x100;_0x502915=_0x5a3ef6[_0x448fc7];_0x5a3ef6[_0x448fc7]=_0x5a3ef6[_0x2c1ff7];_0x5a3ef6[_0x2c1ff7]=_0x502915;}_0x448fc7=0x0;_0x2c1ff7=0x0;for(var _0x3d2458=0x0;_0x3d2458<_0x400c20['length'];_0x3d2458++){_0x448fc7=(_0x448fc7+0x1)%0x100;_0x2c1ff7=(_0x2c1ff7+_0x5a3ef6[_0x448fc7])%0x100;_0x502915=_0x5a3ef6[_0x448fc7];_0x5a3ef6[_0x448fc7]=_0x5a3ef6[_0x2c1ff7];_0x5a3ef6[_0x2c1ff7]=_0x502915;_0x5c54b6+=String['fromCharCode'](_0x400c20["\u0063\u0068\u0061\u0072\u0043\u006f\u0064\u0065\u0041\u0074"](_0x3d2458)^_0x5a3ef6[(_0x5a3ef6[_0x448fc7]+_0x5a3ef6[_0x2c1ff7])%0x100]);}return _0x5c54b6;};_0x244f['ZEeBRs']=_0x2fac5b;_0x5a1857=arguments;_0x244f['BBhriC']=!![];}var _0x3e4080=_0x13ecd7[0x0];var _0x2379dd=_0x399525+_0x3e4080;var _0x244f97=_0x5a1857[_0x2379dd];if(!_0x244f97){if(_0x244f['kgfuHN']===undefined){_0x244f['kgfuHN']=!![];}_0x1a550c=_0x244f["\u005a\u0045\u0065\u0042\u0052\u0073"](_0x1a550c,_0x5ed43f);_0x5a1857[_0x2379dd]=_0x1a550c;}else{_0x1a550c=_0x244f97;}return _0x1a550c;};return _0x244f(_0x5a1857,_0x394446);}(function(_0x2afff9,_0xb324b1){function _0x677adb(_0x4220da,_0x29330e,_0x48c911,_0x667418,_0x2432a5){return _0x244f(_0x48c911- -0x2d3,_0x2432a5);}function _0x3cd28c(_0x182212,_0x1c17df,_0x1d64ee,_0x5777e0,_0x4d58b4){return _0x244f(_0x5777e0- -0x28f,_0x1d64ee);}function _0x587070(_0x8d763c,_0x28b642,_0x34eb7d,_0x532557,_0x39cafa){return _0x244f(_0x28b642- -0x396,_0x532557);}function _0x4723dc(_0x267a09,_0xb907f1,_0x4c9842,_0x3e03ed,_0x5b1473){return _0x244f(_0x4c9842- -0x10e,_0x267a09);}function _0x229591(_0x364a2e,_0x32b744,_0x3113a9,_0x1260ef,_0x21f868){return _0x13ec(_0x3113a9- -0xed,_0x32b744);}function _0x5ee63d(_0x19c7c7,_0x13e6e5,_0xb9e82c,_0x3f45ca,_0x39bf0d){return _0x13ec(_0x39bf0d- -0x1d3,_0x13e6e5);}function _0x588621(_0x5e170d,_0x256897,_0x5ee9c8,_0x270477,_0x5bdb21){return _0x13ec(_0x270477- -0x11a,_0x5e170d);}function _0x33fe05(_0x446b93,_0x3425c2,_0x5826cb,_0x56eb67,_0x4056f1){return _0x13ec(_0x56eb67- -0x354,_0x446b93);}function _0x52b7dc(_0x32eee8,_0x5c9031,_0x48cce3,_0x330ca2,_0x3e6196){return _0x13ec(_0x330ca2-0x31b,_0x5c9031);}var _0x54b38e=_0x2afff9();while(!![]){try{var _0x5647c3=-parseInt(_0x5ee63d(-0x1d8,-0x1c9,-0x1c2,-0x1df,-0x1cc))/0x1+parseInt(_0x229591(-0xe8,-0xee,-0xeb,-0xf5,-0xef))/0x2*(parseInt(_0x5ee63d(-0x1b2,-0x1b1,-0x1b7,-0x1d0,-0x1be))/0x3)+-parseInt(_0x3cd28c(-0x286,-0x27d,"\u0024\u004b\u0064\u0034",-0x27b,-0x282))/0x4*(parseInt(_0x4723dc("\u0036\u0046\u004c\u0051",-0x10f,-0xfd,-0xf8,-0xf7))/0x5)+-parseInt(_0x33fe05(-0x328,-0x340,-0x32b,-0x337,-0x346))/0x6+parseInt(_0x4723dc("ZicT".split("").reverse().join(""),-0xed,-0xf7,-0xf1,-0x101))/0x7*(-parseInt(_0x52b7dc(0x349,0x33d,0x340,0x340,0x349))/0x8)+parseInt(_0x677adb(-0x2c8,-0x2b9,-0x2ba,-0x2b9,"\u0041\u004b\u0024\u0061"))/0x9*(parseInt(_0x5ee63d(-0x19d,-0x1b8,-0x1a8,-0x1b9,-0x1b0))/0xa)+parseInt(_0x33fe05(-0x341,-0x331,-0x346,-0x33e,-0x33a))/0xb;if(_0x5647c3===_0xb324b1){break;}else{_0x54b38e['push'](_0x54b38e['shift']());}}catch(_0x40f3da){_0x54b38e['push'](_0x54b38e['shift']());}}})(_0x3944,0xca8b5);tmixins={'props':[_0x2b16df(-0x34c,-0x365,-0x364,-0x357,-0x354),_0x5be146(-0x97,-0x8e,"\u0034\u0073\u0055\u004d",-0x8f,-0x8c)],"\u0064\u0061\u0074\u0061"(){return{"\u0073\u0063\u006f\u0070\u0065\u0044\u0061\u0074\u0061":{},"\u0073\u0068\u006f\u0077\u0044\u0069\u0061\u006c\u006f\u0067":!![]};},"\u0063\u0072\u0065\u0061\u0074\u0065\u0064"(){this["\u0073\u0063\u006f\u0070\u0065\u0044\u0061\u0074\u0061"]=Object['assign']({},this["\u0066\u006f\u0072\u006d\u0044\u0061\u0074\u0061"]);},'methods':{'dialogClose'(_0x5514d9){this['$emit'](_0xc9f039(0x1e1,0x1e4,0x1d6,0x1ec,0x1f1),this['scopeData']);function _0xc9f039(_0x22089f,_0x19b551,_0x1c3762,_0x3a1f66,_0x52aeae){return _0x13ec(_0x22089f-0x1d8,_0x52aeae);}function _0x4dd73e(_0xfcc7c1,_0x5c135d,_0x4dd03e,_0x2e04dc,_0x12feb){return _0x244f(_0x12feb-0x2d8,_0xfcc7c1);}this["\u0024\u0065\u006d\u0069\u0074"](_0x4dd73e("\u0029\u0072\u0076\u0059",0x2d5,0x2cf,0x2f1,0x2e0),![]);},'dialogPrimary'(){function _0x1aa6b5(_0x361e3a,_0x8a2dd8,_0x2e86eb,_0x178e87,_0x1a6c4a){return _0x13ec(_0x8a2dd8- -0x2f4,_0x361e3a);}this['scopeData']=this['formData'];function _0x19a1ff(_0x53b6a3,_0x3a22f4,_0x3eb0a7,_0x3328c2,_0x38ffb8){return _0x13ec(_0x3328c2- -0x122,_0x3eb0a7);}this['$emit'](_0x1aa6b5(-0x2ee,-0x2dc,-0x2cb,-0x2d7,-0x2d7),this["\u0073\u0063\u006f\u0070\u0065\u0044\u0061\u0074\u0061"]);this['$emit'](_0x19a1ff(-0x112,-0xef,-0xf3,-0x100,-0xf3),![]);},'clear'(){function _0x2d6db0(_0x118a95,_0x18d759,_0x1f126b,_0x384fe3,_0x17c655){return _0x244f(_0x118a95- -0x38a,_0x18d759);}var _0x401509={'jdVHw':_0x2d6db0(-0x37a,"\u0036\u0073\u002a\u0048",-0x368,-0x37f,-0x388)};this["\u0073\u0063\u006f\u0070\u0065\u0044\u0061\u0074\u0061"]={};function _0x1768a5(_0x14d00f,_0x3c3b0d,_0x461e18,_0x244524,_0x24ad4a){return _0x13ec(_0x24ad4a-0x36d,_0x244524);}this['$emit'](_0x1768a5(0x373,0x389,0x363,0x371,0x376),{});this['$emit'](_0x401509['jdVHw']);}}};
+tmixins = {
+  props: ['visiable', 'formData'],
+  data() {
+    return {
+      scopeData: {},
+      showDialog:true
+    };
+  },
+  created() {
+    this.scopeData = Object.assign({}, this.formData);
+  },
+  methods: {
+    dialogClose(event) {
+      this.$emit('update:formData', this.scopeData);
+      this.$emit('update:visiable', false);
+    },
+    dialogPrimary() {
+      this.scopeData = this.formData;
+      this.$emit('confirm', this.scopeData);
+      this.$emit('update:visiable', false);
+    },
+    clear() {
+      this.scopeData = {};
+      this.$emit('update:formData', {});
+      this.$emit('clear');
+    }
+  }
+};
 export const mixins = tmixins

package/src/components/table/tableForm.vue

@@ -105,7 +105,7 @@
       </template>
     </vxe-form>
     <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch" class="adSearchForm_all"
-                          :formData="advancedFormData" @confirm="confirmAdvancedSearchDialog"
+                           @confirm="confirmAdvancedSearchDialog"
                           @clear="clearAdvancedSearchDialog" ref="advancedSearchDialog">
       <template #form>
         <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
@@ -188,7 +188,6 @@
                       placeholder=""
                       size="small"
                       clearable
-                      :value-format="form1Field.valueFormat"
                       v-bind="form1Field.widgetConfig"
                     ></el-time-picker>
                   </template>

package/src/components/table/tableFormMixin.js

@@ -44,7 +44,6 @@ modules = {
         }
       });
       this.advancedFormData = advancedFormData;
-      debugger
       this.formDataClone = this.$baseLodash.cloneDeep(this.formData);
       this.showAdvancedSearch = true;
     },
@@ -75,8 +74,19 @@ modules = {
       $grid.searchColumns.forEach((form1Field) => {
         let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
-          formData[form1Field.field] = nullValue;
-          advancedFormData[form1Field.field] = nullValue;
+          
+          // formData[form1Field.field] = nullValue;
+          if(formData[form1Field.field] && Array.isArray(formData[form1Field.field])  ){
+            formData[form1Field.field].length = 0;
+          }else{
+            formData[form1Field.field] = nullValue;
+          }
+
+          if(advancedFormData[form1Field.field] && Array.isArray(advancedFormData[form1Field.field])  ){
+            advancedFormData[form1Field.field].length = 0;
+          }else{
+            advancedFormData[form1Field.field] = nullValue;
+          }
         }
       });
       this.$emit("advancedClear");