eoss-ui 0.5.41 → 0.5.43

package/package.json

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

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

@@ -390,7 +390,6 @@ export default {
         pageSize: 20,
         totalCount: 0
       },
-      where: {},
       wheres: {},
       tableHeight: 'auto',
       styles: {},
@@ -869,7 +868,7 @@ export default {
         reqData = util.extend({}, reqData, where);
       }
       if (this.retainSearh) {
-        reqData = util.extend({}, reqData, this.where);
+        reqData = util.extend({}, reqData, this.wheres);
       }
       this.tableLoading = true;
       util

package/packages/date-picker/src/main.vue

@@ -17,6 +17,11 @@ const formats = {
 export default {
   name: 'EsDatePicker',
   inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    }
+  },
   props: {
     value: [String, Array, Number, Date],
     display: {
@@ -51,15 +56,18 @@ export default {
     format: String,
     readonly: Boolean,
     plain: Boolean,
-    default: Boolean
+    default: Boolean,
+    setFormKeys: Array
   },
   data() {
-    return {};
+    return {
+      date: ''
+    };
   },
   computed: {
     models: {
       get() {
-        return this.value ? this.value : '';
+        return this.value ? this.value : this.dae;
       },
       set(val) {
         return val;
@@ -97,7 +105,42 @@ export default {
         : '';
     }
   },
-  watch: {},
+  watch: {
+    models: {
+      deep: true,
+      handler(val) {
+        if (
+          this.setFormKeys &&
+          this.esForm &&
+          this.dateType.indexOf('range') > -1
+        ) {
+          let obj = this.esForm.models;
+          this.setFormKeys.forEach((item, index) => {
+            if (val && val.length) {
+              obj[item] = val[index];
+            } else {
+              delete obj[item];
+            }
+          });
+          this.esForm.models = obj;
+        }
+      }
+    },
+    'esForm.models': {
+      deep: true,
+      handler(val) {
+        if (
+          this.setFormKeys &&
+          this.dateType.indexOf('range') > -1 &&
+          !util.isExist(this.value)
+        ) {
+          this.date = this.setFormKeys.map((item) => {
+            return val[item] || '';
+          });
+        }
+      }
+    }
+  },
   mounted() {},
   methods: {
     getData(val) {
@@ -106,7 +149,7 @@ export default {
       }
       if (Array.isArray(val)) {
         val
-          .map(item => {
+          .map((item) => {
             if (typeof item === 'string') {
               return item;
             } else if (typeof item === 'number') {

package/packages/flow/src/component/SendMsg.vue

@@ -13,10 +13,10 @@
         prop="notificationType"
         label="通知方式"
         :rules="[
-          { required: true, message: `请选择通知方式`, trigger: 'blur' }
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="sendInfo.notificationType">
+        <el-checkbox-group v-model="sendInfo.notificationType" style="display:contents">
           <el-checkbox
             v-for="item of notificationList"
             :key="item.cciValue"

package/packages/flow/src/component/taskUnionExamine.vue

@@ -72,10 +72,10 @@
         prop="noticeType"
         label="通知方式"
         :rules="[
-          { required: true, message: `请选择通知方式`, trigger: 'blur' }
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="infoList.noticeType">
+        <el-checkbox-group v-model="infoList.noticeType" style="display:contents">
           <el-checkbox
             v-for="item of infoList.noticeList"
             :key="item.cciValue"

package/packages/flow/src/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div
     class="es-flow-index"
-    :class="{ 'es-flow-narrow': shrink }"
+    :class="{ 'es-flow-narrow': shrink ,required:this.requiredValue}"
     :style="styles"
     v-if="!shrinkAbled"
   >
@@ -732,8 +732,7 @@ export default {
     title: { type: String, default: '事务表单办理' },
     closeParent: Boolean,
     width: {
-      type: String,
-      default: '48px'
+      type: String
     }
   },
   data() {
@@ -745,6 +744,7 @@ export default {
       nextCurrentOrgObjSelect: [],
       loading: null, // 加载中
       newTypeCode: '',
+      requiredValue:false,
       NodeName: '', // 当前节点值
       radioList: [],
       value: '',
@@ -1090,7 +1090,7 @@ export default {
       this.shrink = !this.shrink;
       this.styles = this.shrink
         ? { width: 0 }
-        : { width: parseInt(this.width, 10) + 'px' };
+        : { width: this.width ? parseInt(this.width, 10) + 'px' : '' };
       this.$emit('shrink', this.shrink);
     },
     customLoading(type) {
@@ -1332,14 +1332,17 @@ export default {
         this.beforeSubmit()
           .then((next) => {
             if (!this.value) {
-              return this.$message.warning('请填写意见');
+              // return this.$message.warning('请填写意见');
+        return this.requiredValue = true
+
             }
             this.showReject = true;
           })
           .catch((e) => {});
       } else {
         if (!this.value) {
-          return this.$message.warning('请填写意见');
+          // return this.$message.warning('请填写意见');
+          return this.requiredValue = true
         }
         this.showReject = true;
       }
@@ -1656,7 +1659,8 @@ export default {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           if (this.isOpinionRequired == 1 && (this.value == '' || !this.value))
-            return this.$message.warning('请填写意见');
+          return this.requiredValue = true
+            // return this.$message.warning('请填写意见');
           let params = {
             url: rejectAndEnd,
             headers: { Accept: 'application/json,text/plain' },

package/packages/flow/src/processReject.vue

@@ -32,10 +32,10 @@
         prop="noticeType"
         label="通知方式"
         :rules="[
-          { required: true, message: `请选择通知方式`, trigger: 'blur' }
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="nextNode.noticeType">
+        <el-checkbox-group v-model="nextNode.noticeType" >
           <el-checkbox
             v-for="item of nextNode.noticeList"
             :key="item.cciValue"

package/packages/flow/src/startTaskRead.vue

@@ -106,10 +106,10 @@
         prop="noticeType"
         label="通知方式"
         :rules="[
-          { required: true, message: `请选择通知方式`, trigger: 'blur' }
+          { required: false, message: `请选择通知方式`, trigger: 'blur' }
         ]"
       >
-        <el-checkbox-group v-model="nextNode.noticeType">
+        <el-checkbox-group v-model="nextNode.noticeType" style="display:contents">
           <el-checkbox
             v-for="item of noticeList"
             :key="item.cciValue"

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

@@ -430,7 +430,7 @@ export default {
               return h(
                 'span',
                 {},
-                util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm')
+               params.row.doetime ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm') : ''
               );
             }
           },
@@ -586,7 +586,7 @@ export default {
               return h(
                 'span',
                 {},
-                util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm')
+                params.row.doetime ? util.formatDate(params.row.doetime, 'yyyy-MM-dd HH:mm') : ''
               );
             }
           },

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/flow.scss

@@ -14,6 +14,11 @@
     flex: 1;
   }
 }
+.required{
+  .el-textarea__inner::placeholder {
+    color: red;
+  }
+}
 .no-checked .el-checkbox__input {
   display: none !important;
 }

package/src/index.js

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