eoss-ui 0.5.45 → 0.5.47

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

@@ -373,7 +373,11 @@ export default {
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
-    infiniteScroll: Boolean
+    infiniteScroll: Boolean,
+    isJoin: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -405,6 +409,13 @@ export default {
     };
   },
   computed: {
+    params() {
+      return {
+        ...(this.param || {}),
+        ...(this.searchValue || {}),
+        ...(this.advanceValue || {})
+      };
+    },
     tag() {
       return this.form && this.elForm == '' ? 'el-form' : 'div';
     },
@@ -878,7 +889,7 @@ export default {
       this.tableLoadingText = '加载中...';
       let reqData = util.extend(
         {},
-        this.param,
+        this.params,
         this.page
           ? {
               pageNum: this.config.pageNum,
@@ -892,6 +903,13 @@ export default {
       if (this.retainSearh) {
         reqData = util.extend({}, reqData, this.wheres);
       }
+      if (this.isJoin) {
+        for (let i in reqData) {
+          if (Array.isArray(reqData[i])) {
+            reqData[i] = reqData[i].join(',');
+          }
+        }
+      }
       this.tableLoading = true;
       util
         .ajax({
@@ -1281,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/data-table-form/src/main.vue

@@ -44,9 +44,9 @@ export default {
     },
     cols() {
       let col = [];
-      this.theads.forEach(items => {
+      this.theads.forEach((items) => {
         if (Array.isArray(items)) {
-          items.forEach(item => {
+          items.forEach((item) => {
             if (!item.rowspan || item.rowspan < 2) {
               col.push(item);
             }
@@ -64,9 +64,9 @@ export default {
     },
     types() {
       let types = [];
-      this.theads.forEach(items => {
+      this.theads.forEach((items) => {
         if (Array.isArray(items)) {
-          items.forEach(item => {
+          items.forEach((item) => {
             if (item.type && item.type !== 'text' && item.type !== 'textarea') {
               types.push(item);
             }
@@ -91,9 +91,9 @@ export default {
       deep: true,
       handler(val) {
         if (val) {
-          val.forEach(items => {
+          val.forEach((items) => {
             if (Array.isArray(items)) {
-              items.forEach(item => {
+              items.forEach((item) => {
                 this.getOptions(item);
               });
             } else {
@@ -121,7 +121,7 @@ export default {
             params: params,
             data: params
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               this.option[item.field || item.prop] = JSON.parse(
                 JSON.stringify(res.results)
@@ -137,7 +137,7 @@ export default {
               this.$message.error(msg);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -147,21 +147,28 @@ export default {
   },
   render(h) {
     let tag = this.elForm ? 'div' : 'form';
-    return h(tag, {}, [
-      h('eo-table', {
-        props: {
-          cols: this.cols,
-          thead: this.theads,
-          numbers: this.numbers,
-          cols: this.cols,
-          data: this.models,
-          types: this.types,
-          options: this.options,
-          page: this.page
-        },
-        on: this.$listeners
-      })
-    ]);
+    return h(
+      tag,
+      {
+        class: { 'es-data-form-full': this.full, 'es-data-table-form': 1 }
+      },
+      [
+        h('eo-table', {
+          props: {
+            cols: this.cols,
+            thead: this.theads,
+            numbers: this.numbers,
+            cols: this.cols,
+            data: this.models,
+            types: this.types,
+            options: this.options,
+            page: this.page,
+            ...this.$attrs
+          },
+          on: this.$listeners
+        })
+      ]
+    );
   }
 };
 </script>

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="es-data-form">
+  <div class="es-data-form" :class="{ 'es-data-form-haspage': page }">
     <el-scrollbar class="es-scrollbar" :style="{ height: height }">
       <table
         class="es-data-table-form"
@@ -49,6 +49,7 @@
         <es-select
           v-else-if="item.type === 'select' && selectShow"
           class="es-data-table-form-handle"
+          :suffix="false"
           v-bind="exclAttribute({ data: item, attrs: 'width' })"
           v-model="selectValue"
           ref="tableSelect"
@@ -113,6 +114,11 @@ export default {
       eoTable: this
     };
   },
+  inject: {
+    esDialog: {
+      default: ''
+    }
+  },
   props: {
     height: String,
     readonly: Boolean,
@@ -186,8 +192,15 @@ export default {
       }
     },
     setStyle(res, data, field) {
-      this.style.left = res ? res.left + 'px' : '';
-      this.style.top = res ? res.top + 'px' : '';
+      let left = 0;
+      let top = 0;
+      if (this.esDialog) {
+        let style = this.esDialog.getDialog().getBoundingClientRect();
+        left = style.left;
+        top = style.top;
+      }
+      this.style.left = res ? res.left - left + 'px' : '';
+      this.style.top = res ? res.top - top + 'px' : '';
       this.style.width = res ? res.width + 'px' : '';
       this.target = data;
       this.field = field;

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' ||
@@ -475,6 +468,9 @@ export default {
       this.zoom = res;
       this.$set(this.scales, 'zoom', res);
       this.$emit('scale', res);
+    },
+    getDialog() {
+      return this.$refs[this.wujieName].$refs['dialog'];
     }
   }
 };

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/nav/src/main.vue

@@ -109,7 +109,7 @@ export default {
       let active =
         typeof this.defaultActive === 'string'
           ? this.defaultActive
-          : this.defaultActive.length
+          : this.defaultActive && this.defaultActive.length
           ? this.defaultActive[this.defaultActive.length - 1]
           : undefined;
       return active;

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/theme-chalk/src/cascader.scss

@@ -0,0 +1,93 @@
+.es-calendar {
+  background-color: #fff;
+  .es-calendar-title {
+    height: 44px;
+    padding: 12px 30px;
+    background-color: #ffffff;
+    font-family: PingFang SC, PingFang SC;
+    font-weight: 400;
+    font-size: 14px;
+    color: #262626;
+    line-height: 20px;
+    text-align: center;
+    position: relative;
+    display: flex;
+    justify-content: center;
+    .es-calendar-prev,
+    .es-calendar-next {
+      cursor: pointer;
+      font-size: 14px;
+      color: #8c8c8c;
+      line-height: 20px;
+    }
+    .es-calendar-prev {
+      margin-right: 8px;
+    }
+    .es-calendar-next {
+      margin-left: 8px;
+    }
+    .es-title {
+      width: 86px;
+    }
+  }
+  .es-calendar-weeks {
+    display: flex;
+    flex-wrap: wrap;
+    .es-week {
+      width: (100% / 7);
+      height: 20px;
+      text-align: center;
+      line-height: 20px;
+      font-weight: 400;
+      font-size: 12px;
+      color: #8c8c8c;
+    }
+  }
+  .es-calendar-days {
+    display: flex;
+    flex-wrap: wrap;
+    .es-day {
+      width: (100% / 7);
+      height: 44px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .es-day-item {
+        width: 28px;
+        height: 28px;
+        font-weight: 400;
+        font-size: 14px;
+        color: #262626;
+        text-align: center;
+        line-height: 28px;
+        position: relative;
+        cursor: pointer;
+        &.es-disabled-day {
+          color: #bfbfbf;
+        }
+        &.es-today {
+          color: #2778e5;
+          border: 1px solid #2778e5;
+          line-height: 26px;
+          border-radius: 15px 15px 15px 15px;
+        }
+        &.es-select {
+          color: #fff;
+          background-color: #2778e5;
+          border-radius: 15px 15px 15px 15px;
+        }
+      }
+    }
+  }
+  .es-calendar-switch {
+    height: 22px;
+    line-height: 22px;
+    font-weight: bold;
+    text-align: center;
+    color: #8c8c8c;
+    .es-switch-icon {
+      font-size: 14px;
+      cursor: pointer;
+    }
+  }
+}

package/packages/theme-chalk/src/data-table-form.scss

@@ -38,6 +38,17 @@
   .es-data-form-head {
     background-color: $--table-header-background-color;
   }
+  &.es-data-form-full {
+    height: 100%;
+    .es-data-form {
+      height: 100%;
+      &.es-data-form-haspage {
+        .es-scrollbar {
+          height: calc(100% - 46px);
+        }
+      }
+    }
+  }
 }
 .es-data-form {
   position: relative;

package/packages/theme-chalk/src/index.scss

@@ -1,9 +1,10 @@
 @import "./base.scss";
 @import "./button.scss";
 @import "./button-group.scss";
-@import "./checkbox-group.scss";
+@import "./calendar.scss";
 @import "./card.scss";
 @import "./cascader.scss";
+@import "./checkbox-group.scss";
 @import "./clients.scss";
 @import "./data-table.scss";
 @import "./data-table-form.scss";

package/packages/theme-chalk/src/toolbar.scss

@@ -107,6 +107,19 @@
       }
     }
   }
+  .es-form-search-small {
+    .el-form-item__content {
+      line-height: 32px !important;
+    }
+    .el-form-item__label {
+      line-height: 32px !important;
+      height: 32px;
+    }
+  }
+  .el-button.es-upload {
+    padding: 0 !important;
+    border: 0 !important;
+  }
   .es-advanced-filter {
     margin-top: 20px;
     z-index: 9;
@@ -129,15 +142,4 @@
       }
     }
   }
-  .el-form-item__content {
-    line-height: 32px !important;
-  }
-  .el-form-item__label {
-    line-height: 32px !important;
-    height: 32px;
-  }
-  .el-button.es-upload {
-    padding: 0 !important;
-    border: 0 !important;
-  }
 }

package/packages/toolbar/src/main.vue

@@ -51,41 +51,25 @@ export default {
       default: 'auto'
     }
   },
-  computed: {
-    searchData: {
-      get() {
-        let value;
-        for (let i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'search') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.searchValue;
-      },
-      set(val) {
-        return val;
+  watch: {
+    searchValue: {
+      deep: true,
+      handler(val) {
+        this.searchData = JSON.parse(JSON.stringify(val));
       }
     },
-    advancedData: {
-      get() {
-        let value;
-        for (let i = 0; i < this.contents.length; i++) {
-          if (this.contents[i].type === 'filter') {
-            value = this.contents[i].value || this.contents[i].searchValue;
-            break;
-          }
-        }
-        return value ? value : this.advanceValue;
-      },
-      set(val) {
-        return val;
+    advanceValue: {
+      deep: true,
+      handler(val) {
+        this.advancedData = JSON.parse(JSON.stringify(val));
       }
     }
   },
   data() {
     return {
-      show: false
+      show: false,
+      searchData: JSON.parse(JSON.stringify(this.searchValue)),
+      advancedData: JSON.parse(JSON.stringify(this.advanceValue))
     };
   },
   created() {
@@ -132,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) {
@@ -338,26 +323,28 @@ export default {
                 ]
               },
               [
-                h(
-                  'es-form',
-                  {
-                    class: 'es-form-search',
-                    ref: 'filter',
-                    props: {
-                      ...other,
-                      ...(config || {}),
-                      size: 'medium',
-                      closeDialog: false,
-                      model: this.advancedData,
-                      contents: contents
-                    },
-                    on: {
-                      submit: this.hanleSubmit,
-                      reset: this.hanleCancel
-                    }
-                  },
-                  []
-                )
+                this.show
+                  ? h(
+                      'es-form',
+                      {
+                        class: 'es-form-advanced-filter',
+                        ref: 'filter',
+                        props: {
+                          ...other,
+                          ...(config || {}),
+                          size: 'medium',
+                          closeDialog: false,
+                          model: this.advancedData,
+                          contents: contents
+                        },
+                        on: {
+                          submit: this.hanleSubmit,
+                          reset: this.hanleCancel
+                        }
+                      },
+                      []
+                    )
+                  : ''
               ]
             )
           ]