eoss-ui 0.5.44 → 0.5.46

package/packages/calendar/src/main.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="es-calendar">
+    <div class="es-calendar-title" v-show="showTitle">
+      <i class="es-calendar-prev es-icon-pointer-left" @click="prev"></i>
+      <div class="es-title" @click="resetDate">
+        <slot name="title" :year="year" :month="month">
+          {{ year }}年{{ month }}月
+        </slot>
+      </div>
+      <i class="es-calendar-next es-icon-pointer-right" @click="next"></i>
+    </div>
+    <ul class="es-calendar-weeks">
+      <li v-for="(item, index) in weeks" :key="index" class="es-week">
+        {{ item }}
+      </li>
+    </ul>
+    <ul class="es-calendar-days">
+      <li
+        class="es-day"
+        @click="handleClick(item)"
+        v-for="(item, index) in lists"
+        :key="`${item.year}-${item.month}-${item.date}`"
+      >
+        <div
+          class="es-day-item"
+          :class="{
+            'es-disabled-day': item.type == 0,
+            'es-today': isSelect(item, today) && mark,
+            'es-select': isSelect(item, select)
+          }"
+        >
+          {{ item.date }}
+          <slot name="mark" :data="item"></slot>
+        </div>
+      </li>
+    </ul>
+    <div class="es-calendar-switch" v-show="fold">
+      <i
+        class="es-icon-pointer-up es-switch-icon"
+        name=""
+        @click="handleHide"
+        v-show="all"
+      ></i>
+      <i
+        class="es-icon-pointer-down es-switch-icon"
+        @click="handleShow"
+        v-show="!all"
+      ></i>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'esCalendar',
+  props: {
+    //显示title
+    showTitle: {
+      type: Boolean,
+      default: true
+    },
+    //指定日期
+    date: [String, Number],
+    //是否只显示本周
+    brief: Boolean,
+    //是否等指定日期传入后再渲染
+    wait: Boolean,
+    //是否显示收起展开按钮
+    fold: {
+      type: Boolean,
+      default: true
+    },
+    mark: Boolean
+  },
+  watch: {
+    date: {
+      immediate: true,
+      handler(val) {
+        if (this.wait) {
+          val && this.init();
+        } else {
+          this.init();
+        }
+      }
+    },
+    brief: {
+      immediate: true,
+      handler(val) {
+        this.all = !val;
+      }
+    }
+  },
+  computed: {
+    lists() {
+      if (this.all) {
+        return this.daysList;
+      }
+      return this.daysList.filter((item) => {
+        for (let i = 0; i < this.weekDate.length; i++) {
+          let ele = this.weekDate[i];
+          if (
+            item.year == ele.year &&
+            item.month == ele.month &&
+            item.date == ele.date
+          ) {
+            return true;
+          }
+        }
+      });
+    }
+  },
+  data() {
+    return {
+      year: '',
+      _month: '',
+      weeks: ['日', '一', '二', '三', '四', '五', '六'],
+      weekDate: [],
+      week7: '',
+      today: '',
+      select: '',
+      selectDate: '',
+      daysList: [],
+      all: true,
+      week: 0,
+      prevMonthDays: 0,
+      nextMonthDays: 0,
+      days: 0
+    };
+  },
+  mounted() {},
+  methods: {
+    resetDate() {
+      this.week = 0;
+      this.init();
+    },
+    init(res) {
+      this.daysList = [];
+      let dates = this.getDays(res ? res : this.date);
+      let {
+        year,
+        month,
+        today,
+        daysList,
+        weekDate,
+        prevMonthDays,
+        nextMonthDays,
+        days
+      } = dates;
+      if (!res) {
+        this.today = `${year}/${month}/${today}`;
+        this.selectDate = today;
+        this.select = `${year}/${month}/${today}`;
+        this.$emit('select', { year, month, date: today, type: 1 });
+      }
+      this.prevMonthDays = prevMonthDays;
+      this.nextMonthDays = nextMonthDays;
+      this.days = days;
+      this.daysList = daysList;
+      this.year = year;
+      this.month = month;
+      if (!this.weekDate.length) {
+        this.weekDate = weekDate;
+      }
+      this.$emit('init', dates);
+      return dates;
+    },
+    isShow(res) {
+      if (this.all) {
+        return true;
+      }
+      return this.weekDate.filter((item) => {
+        return (
+          item.year == res.year &&
+          item.month == res.month &&
+          item.date == res.date
+        );
+      }).length;
+    },
+    isSelect(res, target) {
+      let { year, month, date } = res;
+      return target == `${year}/${month}/${date}`;
+    },
+    handleClick(res) {
+      let { year, month, date } = res;
+      this.selectDate = date;
+      this.select = `${year}/${month}/${date}`;
+      this.$emit('select', res);
+    },
+    prev() {
+      if (this.all) {
+        this.weekDate = [];
+        this.prevMonth();
+      } else {
+        this.weekDate = this.getWeekDay(-1);
+        this.$emit('prev', this.weekDate, 'week');
+      }
+    },
+    next() {
+      if (this.all) {
+        this.weekDate = [];
+        this.nextMonth();
+      } else {
+        this.weekDate = this.getWeekDay(1);
+        this.$emit('next', this.weekDate, 'week');
+      }
+    },
+    prevMonth() {
+      let year = this.year;
+      let month = this.month;
+      let dates = this.select.split('/');
+      if (month == 1) {
+        year -= 1;
+        month = 12;
+      } else {
+        month -= 1;
+      }
+      let date =
+        year == dates[0] && month == dates[1] ? dates[2] : this.prevMonthDays;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      let res = this.init(`${year}/${month}/${date}`);
+      this.$emit('prev', res, 'month');
+    },
+    nextMonth() {
+      let year = this.year;
+      let month = this.month;
+      let dates = this.select.split('/');
+      if (month == 12) {
+        year += 1;
+        month = 1;
+      } else {
+        month += 1;
+      }
+      let date = year == dates[0] && month == dates[1] ? dates[2] : 1;
+      date = date.toString().padStart(2, '0');
+      month = month.toString().padStart(2, '0');
+      let res = this.init(`${year}/${month}/${date}`);
+      this.$emit('next', res, 'month');
+    },
+    //获取当月或指定日期所在月天数
+    getDays(res) {
+      const date = res ? new Date(res) : new Date();
+      const year = date.getFullYear();
+      const month = date.getMonth();
+      const today = date.getDate();
+      const week = date.getDay();
+      //此月天数
+      const days = new Date(year, month + 1, 0).getDate();
+      //此月第一天周几
+      const stratDay = new Date(year, month, 1).getDay();
+      //此月最后一天周几
+      const endDay = new Date(year, month, days).getDay();
+      //上月天数
+      const prevMonthDays =
+        month == 0
+          ? new Date(year - 1, 11, 0).getDate()
+          : new Date(year, month, 0).getDate();
+      //下月天数
+      const nextMonthDays =
+        month == 11
+          ? new Date(year + 1, 1, 0).getDate()
+          : new Date(year, month + 2, 0).getDate();
+      //当前日期所在的周
+      const weekDate = [{ date: today, year: year, month: month + 1 }];
+      for (let i = 0; i < week; i++) {
+        let d = i + 1;
+        if (today - d > 1) {
+          weekDate.unshift({
+            date: today - d,
+            year: year,
+            month: month + 1
+          });
+        } else {
+          weekDate.unshift({
+            date: prevMonthDays - i,
+            year: month == 0 ? year - 1 : year,
+            month: month == 0 ? 12 : month
+          });
+        }
+      }
+      for (let i = 0; i < 6 - week; i++) {
+        let d = i + 1;
+        if (today + d <= days) {
+          weekDate.unshift({
+            date: today + d,
+            year: year,
+            month: month + 1
+          });
+        } else {
+          weekDate.push({
+            date: today + d - days,
+            year: month == 11 ? year + 1 : year,
+            month: month == 11 ? 1 : month + 2
+          });
+        }
+      }
+
+      let daysList = [];
+      //本月前加入数组
+      if (stratDay > 0) {
+        for (let i = prevMonthDays; i > prevMonthDays - stratDay; i--) {
+          daysList.unshift({
+            date: i,
+            type: 0,
+            year: month == 0 ? year - 1 : year,
+            month: month == 0 ? 12 : month
+          });
+        }
+      }
+      //本月加入数组
+      for (let i = 1; i <= days; i++) {
+        daysList.push({
+          date: i,
+          type: 1,
+          year: year,
+          month: month + 1,
+          row: week < 6 && today + week > days
+        });
+      }
+      //本月后加入数组
+      if (endDay < 6) {
+        for (var i = 1; i < 6 - endDay + 1; i++) {
+          daysList.push({
+            date: i,
+            type: 0,
+            year: month == 11 ? year + 1 : year,
+            month: month == 11 ? 1 : month + 2
+          });
+        }
+      }
+      return {
+        days: days,
+        prevMonthDays: prevMonthDays,
+        nextMonthDays: nextMonthDays,
+        stratDay: stratDay,
+        endDay: endDay,
+        weekDate: weekDate,
+        year: year,
+        month: month + 1,
+        today: today,
+        week: week,
+        daysList: daysList
+      };
+    },
+    getWeekDay(val) {
+      let flag = true;
+      let weekDate = JSON.parse(JSON.stringify(this.weekDate));
+      let days = weekDate.map((item) => {
+        let { date, month, year } = item;
+        date += val * 7;
+        if (date < 1) {
+          date += this.prevMonthDays;
+          month -= 1;
+          if (month == 0) {
+            month = 12;
+            year -= 1;
+          }
+        } else if (date > this.days) {
+          date -= this.days;
+          month += 1;
+          if (month > 12) {
+            month = 1;
+            year += 1;
+          }
+        }
+        if (this.month == month) {
+          flag = false;
+        }
+        return { date, month, year };
+      });
+      if (flag) {
+        val == 1 ? this.nextMonth() : this.prevMonth();
+      }
+      return days;
+    },
+    handleShow() {
+      this.all = true;
+      this.$emit('show', true);
+    },
+    handleHide() {
+      this.all = false;
+      this.$emit('show', false);
+    }
+  }
+};
+</script>

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 {
@@ -863,7 +867,6 @@ export default {
         });
     },
     getTableData(res) {
-      console.log(11212);
       let where;
       let first;
       if (res) {
@@ -893,6 +896,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({

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,18 +381,15 @@ export default {
   created() {
     let availWidth = 0;
     let availHeight = 0;
+    let win;
     try {
-      availWidth = util.win.top.document.body.offsetWidth - 260;
-      availHeight = util.win.top.document.body.offsetHeight - 60;
+      util.win.top.document;
+      win = util.win.top;
     } catch (error) {
-      try {
-        availWidth = util.win.parent.document.body.offsetWidth - 260;
-        availHeight = util.win.parent.document.body.offsetHeight - 60;
-      } catch (error) {
-        availWidth = util.win.document.body.offsetWidth - 260;
-        availHeight = util.win.document.body.offsetHeight - 60;
-      }
+      win = util.getMyWinTop();
     }
+    availWidth = win.document.body.offsetWidth - 260;
+    availHeight = win.document.body.offsetHeight - 60;
     this.sizes.max = { width: `${availWidth}px`, height: `${availHeight}px` };
     if (
       this.size === 'full' ||
@@ -478,6 +475,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,18 +575,15 @@ export default {
         let name = item.name;
         let width = 0;
         let height = 0;
+        let win;
         try {
-          width = util.win.top.screen.availWidth - 10;
-          height = util.win.top.screen.availHeight - 60;
+          util.win.top.document;
+          win = util.win.top;
         } catch (error) {
-          try {
-            width = util.win.parent.screen.availWidth - 10;
-            height = util.win.parent.screen.availHeight - 60;
-          } catch (error) {
-            width = util.win.screen.availWidth - 10;
-            height = util.win.screen.availHeight - 60;
-          }
+          win = util.getMyWinTop();
         }
+        width = win.screen.availWidth - 10;
+        height = win.screen.availHeight - 60;
         if (item.url) {
           url = this.handleUrlJoinParams(item);
         }
@@ -658,15 +655,15 @@ export default {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
       } else if (util.win.opener) {
+        let win;
         try {
-          util.win.top.close();
+          util.win.top.document;
+          win = util.win.top;
         } catch (error) {
-          try {
-            util.win.parent.close();
-          } catch (error) {
-            util.win.postMessage({ type: 0 }, '*');
-          }
+          win = util.getMyWinTop();
         }
+        win.close();
+        win.postMessage({ type: 0 }, '*');
       }
       if (this.events && this.events.success) {
         this.events.success();

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

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

package/packages/handler/src/main.vue

@@ -147,7 +147,10 @@ export default {
       type: Boolean,
       default: false
     },
-    maxHeight: String
+    maxHeight: {
+      type: String,
+      default: '100%'
+    }
   },
   watch: {
     subSystem: {