eoss-ui 0.5.45 → 0.5.46

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

@@ -475,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/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/lib/cascader.css

@@ -0,0 +1 @@
+.es-calendar{background-color:#fff}.es-calendar .es-calendar-title{height:44px;padding:12px 30px;background-color:#fff;font-family:PingFang SC,PingFang SC;font-weight:400;font-size:14px;color:#262626;line-height:20px;text-align:center;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-title .es-calendar-next,.es-calendar .es-calendar-title .es-calendar-prev{cursor:pointer;font-size:14px;color:#8c8c8c;line-height:20px}.es-calendar .es-calendar-title .es-calendar-prev{margin-right:8px}.es-calendar .es-calendar-title .es-calendar-next{margin-left:8px}.es-calendar .es-calendar-title .es-title{width:86px}.es-calendar .es-calendar-weeks{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-calendar .es-calendar-weeks .es-week{width:14.28571%;height:20px;text-align:center;line-height:20px;font-weight:400;font-size:12px;color:#8c8c8c}.es-calendar .es-calendar-days{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-calendar .es-calendar-days .es-day{width:14.28571%;height:44px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-calendar .es-calendar-days .es-day .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-calendar .es-calendar-days .es-day .es-day-item.es-disabled-day{color:#bfbfbf}.es-calendar .es-calendar-days .es-day .es-day-item.es-today{color:#2778e5;border:1px solid #2778e5;line-height:26px;border-radius:15px}.es-calendar .es-calendar-days .es-day .es-day-item.es-select{color:#fff;background-color:#2778e5;border-radius:15px}.es-calendar .es-calendar-switch{height:22px;line-height:22px;font-weight:700;text-align:center;color:#8c8c8c}.es-calendar .es-calendar-switch .es-switch-icon{font-size:14px;cursor:pointer}

package/packages/theme-chalk/lib/data-table-form.css

@@ -1 +1 @@
-@charset "UTF-8";.es-data-form,.es-data-table-form td .es-input-box,.es-data-table-form th .es-input-box{position:relative}.es-data-table-form{min-width:100%;border-color:#e1e1e1;background-color:#fff;font-size:14px;table-layout:fixed}.es-data-table-form td,.es-data-table-form th{padding:6px;line-height:28px}.es-data-table-form td.numbers,.es-data-table-form th.numbers{text-align:center}.es-data-table-form td .cell,.es-data-table-form th .cell{min-height:28px}.es-data-table-form td .cell.is-textarea,.es-data-table-form th .cell.is-textarea{line-height:20px}.es-data-table-form td .cell.es-required::before,.es-data-table-form th .cell.es-required::before{content:'*';color:#f56c6c}.es-data-table-form td .es-input-box .es-select-multiple,.es-data-table-form th .es-input-box .es-select-multiple{height:auto;min-height:40px;line-height:1;padding:4px 6px 4px 0}.es-data-table-form td .es-input-box .es-select-multiple .el-tag,.es-data-table-form th .es-input-box .es-select-multiple .el-tag{margin:2px 0 2px 6px}.es-data-table-form .es-data-form-head{background-color:#f8f8f8}.es-data-form .es-table-page{height:46px;text-align:center;border:1px solid #e1e1e1;padding:8px 12px;margin-top:-1px;background-color:#f8f8f8}.es-data-form .es-data-table-form-handle{position:fixed;opacity:0}
+@charset "UTF-8";.es-data-form,.es-data-table-form td .es-input-box,.es-data-table-form th .es-input-box{position:relative}.es-data-table-form{min-width:100%;border-color:#e1e1e1;background-color:#fff;font-size:14px;table-layout:fixed}.es-data-table-form td,.es-data-table-form th{padding:6px;line-height:28px}.es-data-table-form td.numbers,.es-data-table-form th.numbers{text-align:center}.es-data-table-form td .cell,.es-data-table-form th .cell{min-height:28px}.es-data-table-form td .cell.is-textarea,.es-data-table-form th .cell.is-textarea{line-height:20px}.es-data-table-form td .cell.es-required::before,.es-data-table-form th .cell.es-required::before{content:'*';color:#f56c6c}.es-data-table-form td .es-input-box .es-select-multiple,.es-data-table-form th .es-input-box .es-select-multiple{height:auto;min-height:40px;line-height:1;padding:4px 6px 4px 0}.es-data-table-form td .es-input-box .es-select-multiple .el-tag,.es-data-table-form th .es-input-box .es-select-multiple .el-tag{margin:2px 0 2px 6px}.es-data-table-form .es-data-form-head{background-color:#f8f8f8}.es-data-table-form.es-data-form-full,.es-data-table-form.es-data-form-full .es-data-form{height:100%}.es-data-table-form.es-data-form-full .es-data-form.es-data-form-haspage .es-scrollbar{height:calc(100% - 46px)}.es-data-form .es-table-page{height:46px;text-align:center;border:1px solid #e1e1e1;padding:8px 12px;margin-top:-1px;background-color:#f8f8f8}.es-data-form .es-data-table-form-handle{position:fixed;opacity:0}