eoss-ui 0.5.46 → 0.5.47

package/lib/toolbar.js

@@ -260,21 +260,21 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     searchValue: {
       deep: true,
       handler: function handler(val) {
-        this.searchData = val;
+        this.searchData = JSON.parse(JSON.stringify(val));
       }
     },
     advanceValue: {
       deep: true,
       handler: function handler(val) {
-        this.advancedData = val;
+        this.advancedData = JSON.parse(JSON.stringify(val));
       }
     }
   },
   data: function data() {
     return {
       show: false,
-      searchData: this.searchValue,
-      advancedData: this.advanceValue
+      searchData: JSON.parse(JSON.stringify(this.searchValue)),
+      advancedData: JSON.parse(JSON.stringify(this.advanceValue))
     };
   },
   created: function created() {
@@ -324,13 +324,14 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
     hanleReset: function hanleReset() {
       this.$refs.filter && this.$refs.filter.resetFields();
-      this.searchData = {};
-      this.advancedData = {};
-      this.$emit('reset');
+      this.searchData = JSON.parse(JSON.stringify(this.searchValue));
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('reset', this.searchData);
     },
     hanleCancel: function hanleCancel() {
       this.show = false;
-      this.$emit('cancel');
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('cancel', this.advancedData);
     }
   },
   render: function render(h) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.46",
+  "version": "0.5.47",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/button/src/main.vue

@@ -70,15 +70,8 @@ export default {
           evt.preventDefault();
           let width = 0;
           let height = 0;
-          let win;
-          try {
-            util.win.top.document;
-            win = util.win.top;
-          } catch (error) {
-            win = util.getMyWinTop();
-          }
-          width = win.screen.availWidth - 10;
-          height = win.screen.availHeight - 60;
+          width = util.win.top.screen.availWidth - 10;
+          height = util.win.top.screen.availHeight - 60;
           let flag = true;
           if (this.esForm) {
             let params = util.getParams({ url: this.link });

package/packages/data-table/src/main.vue

@@ -409,6 +409,13 @@ export default {
     };
   },
   computed: {
+    params() {
+      return {
+        ...(this.param || {}),
+        ...(this.searchValue || {}),
+        ...(this.advanceValue || {})
+      };
+    },
     tag() {
       return this.form && this.elForm == '' ? 'el-form' : 'div';
     },
@@ -882,7 +889,7 @@ export default {
       this.tableLoadingText = '加载中...';
       let reqData = util.extend(
         {},
-        this.param,
+        this.params,
         this.page
           ? {
               pageNum: this.config.pageNum,
@@ -1292,50 +1299,44 @@ export default {
       this.$emit('next', res);
     },
     hanleSearch(data) {
-      this.wheres = data;
-      if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
+      this.wheres =
+        this.response !== undefined
+          ? this.response({
               type: 'search',
               data: JSON.parse(JSON.stringify(data))
             })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+          : data;
+      if (this.url) {
+        this.getTableData();
       }
-      this.$emit('search', data);
+      this.$emit('search', this.wheres);
     },
     hanleReset() {
       if (this.url) {
         this.wheres = {};
         this.getTableData();
       }
-      this.$emit('reset');
+      this.$emit('reset', this.params);
     },
     hanleSubmit({ data, show }) {
-      this.wheres = data;
-      if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
+      this.wheres =
+        this.response !== undefined
+          ? this.response({
               type: 'filter',
               data: JSON.parse(JSON.stringify(data))
             })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+          : data;
+      if (this.url) {
+        this.getTableData();
       }
-      this.$emit('submit', { data, show });
+      this.$emit('submit', { data: this.wheres, show });
     },
     hanleCancel() {
-      if (this.url && JSON.stringify(this.wheres) !== '{}') {
-        this.wheres = {};
-        this.getTableData();
-      }
-      this.$emit('cancel');
+      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
+      //   this.wheres = {};
+      //   this.getTableData();
+      // }
+      this.$emit('cancel', this.params);
     },
     handleTabs({ item, index }) {
       if (this.url) {

package/packages/dialog/src/main.vue

@@ -381,15 +381,8 @@ export default {
   created() {
     let availWidth = 0;
     let availHeight = 0;
-    let win;
-    try {
-      util.win.top.document;
-      win = util.win.top;
-    } catch (error) {
-      win = util.getMyWinTop();
-    }
-    availWidth = win.document.body.offsetWidth - 260;
-    availHeight = win.document.body.offsetHeight - 60;
+    availWidth = util.win.top.document.body.offsetWidth - 260;
+    availHeight = util.win.top.document.body.offsetHeight - 60;
     this.sizes.max = { width: `${availWidth}px`, height: `${availHeight}px` };
     if (
       this.size === 'full' ||

package/packages/flow-group/src/main.vue

@@ -575,13 +575,7 @@ export default {
         let name = item.name;
         let width = 0;
         let height = 0;
-        let win;
-        try {
-          util.win.top.document;
-          win = util.win.top;
-        } catch (error) {
-          win = util.getMyWinTop();
-        }
+        let win = util.win.top;
         width = win.screen.availWidth - 10;
         height = win.screen.availHeight - 60;
         if (item.url) {
@@ -654,16 +648,10 @@ export default {
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (util.win.opener) {
-        let win;
-        try {
-          util.win.top.document;
-          win = util.win.top;
-        } catch (error) {
-          win = util.getMyWinTop();
-        }
-        win.close();
-        win.postMessage({ type: 0 }, '*');
+      } else if (util.win.top.COOS_SDK) {
+        util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();
+      } else if (util.win.top.opener) {
+        util.win.top.close();
       }
       if (this.events && this.events.success) {
         this.events.success();

package/packages/handle-user/src/main.vue

@@ -98,13 +98,7 @@ export default {
                 duration: 500,
                 onClose: () => {
                   util.removeStorage(['mainConfig', 'jump']);
-                  let win;
-                  try {
-                    util.win.top.document;
-                    win = util.win.top;
-                  } catch (error) {
-                    win = util.getMyWinTop();
-                  }
+                  let win = util.win.top;
                   win.location.reload();
                 }
               });

package/packages/theme-chalk/gulpfile.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const { series, src, dest } = require('gulp');
+const sass = require('gulp-sass');
+const autoprefixer = require('gulp-autoprefixer');
+const cssmin = require('gulp-cssmin');
+
+function compile() {
+  return src('./src/*.scss')
+    .pipe(sass.sync())
+    .pipe(autoprefixer({
+      overrideBrowserslist: ['ie > 9', 'last 2 versions'],
+      cascade: false
+    }))
+    .pipe(cssmin())
+    .pipe(dest('./lib'));
+}
+
+function copyfont() {
+  return src('./src/fonts/**')
+    .pipe(cssmin())
+    .pipe(dest('./lib/fonts'));
+}
+
+exports.build = series(compile, copyfont);

package/packages/toolbar/src/main.vue

@@ -55,21 +55,21 @@ export default {
     searchValue: {
       deep: true,
       handler(val) {
-        this.searchData = val;
+        this.searchData = JSON.parse(JSON.stringify(val));
       }
     },
     advanceValue: {
       deep: true,
       handler(val) {
-        this.advancedData = val;
+        this.advancedData = JSON.parse(JSON.stringify(val));
       }
     }
   },
   data() {
     return {
       show: false,
-      searchData: this.searchValue,
-      advancedData: this.advanceValue
+      searchData: JSON.parse(JSON.stringify(this.searchValue)),
+      advancedData: JSON.parse(JSON.stringify(this.advanceValue))
     };
   },
   created() {
@@ -116,13 +116,14 @@ export default {
     },
     hanleReset() {
       this.$refs.filter && this.$refs.filter.resetFields();
-      this.searchData = {};
-      this.advancedData = {};
-      this.$emit('reset');
+      this.searchData = JSON.parse(JSON.stringify(this.searchValue));
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('reset', this.searchData);
     },
     hanleCancel() {
       this.show = false;
-      this.$emit('cancel');
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('cancel', this.advancedData);
     }
   },
   render(h) {

package/src/index.js

@@ -119,7 +119,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.46',
+  version: '0.5.47',
   install,
   Button,
   ButtonGroup,