eoss-ui 0.5.24 → 0.5.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.24",
+  "version": "0.5.26",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.79",
+    "eoss-element": "^0.2.80",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/button/src/main.vue

@@ -45,7 +45,8 @@ export default {
     stop: Boolean,
     syncKeys: Object,
     text: String,
-    onClick: Function
+    onClick: Function,
+    badge: [Object, Number]
   },
   computed: {
     _type() {
@@ -270,6 +271,46 @@ export default {
         this.size ? `el-button--${this.size}` : ''
       ]);
     }
+    if (this.badge) {
+      let config = {};
+      if (typeof this.badge === 'number') {
+        config = { class: 'es-button-badge', props: { value: this.badge } };
+      } else {
+        let { value, max, isDot, hidden, type } = this.badge;
+        config = {
+          class: this.badge.class
+            ? this.badge.class + ' es-button-badge'
+            : 'es-button-badge',
+          props: { value, max, isDot, hidden, type }
+        };
+      }
+      return h('el-badge', config, [
+        h(
+          tag,
+          {
+            class: clas,
+            props: { ...this.$attrs, ...props },
+            attrs: attrs,
+            on: { ...this.$listeners, click: this.handleClick },
+            directives: [
+              {
+                name: 'show',
+                value: !this.hide
+              }
+            ]
+          },
+          this.iconPlacement === 'start'
+            ? [
+                this.icon ? h('i', { class: this.icon }) : '',
+                this.$slots.default || this.text
+              ]
+            : [
+                this.$slots.default || this.text,
+                this.icon ? h('i', { class: this.icon }) : ''
+              ]
+        )
+      ]);
+    }
     return h(
       tag,
       {

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

@@ -178,7 +178,9 @@ export default {
     },
     labelVal() {
       let model =
-        typeof this.model === 'string' ? this.model.split(',') : this.model;
+        typeof this.model === 'string'
+          ? this.model.split(',')
+          : this.model || [];
       let label = model.map((item) => {
         if (util.isObject(item)) {
           return item[this.label];

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

@@ -258,10 +258,14 @@
               }
             "
           ></es-selector>
-          <template v-else-if="type === 'text' || type === 'textarea'">
+          <template
+            v-else-if="
+              type === 'text' || type === 'input' || type === 'textarea'
+            "
+          >
             <template v-if="config.lazy">
               <input
-                v-if="type === 'text'"
+                v-if="type === 'text' || type === 'input'"
                 class="el-input__inner"
                 v-bind="formOption"
                 v-model.lazy="scope.row[field]"
@@ -338,6 +342,7 @@
             <es-input
               v-else
               v-bind="formOption"
+              :type="type"
               :scope="scope"
               v-model="scope.row[field || prop]"
               @blur="
@@ -386,6 +391,11 @@
       <template v-else-if="dateFormat">
         {{ formatDate(scope.row[field || prop], dateFormat) }}
       </template>
+      <span
+        v-else-if="type === 'textarea'"
+        v-html="format(scope.row, true)"
+        :style="styles ? styles[scope.row[prop]] : {}"
+      ></span>
       <span v-else :style="styles ? styles[scope.row[prop]] : {}">{{
         format(scope.row)
       }}</span>
@@ -524,6 +534,18 @@ export default {
         config = { type: this.type, ...config, ...this.$attrs };
         return config;
       }
+      let required = this.required;
+      if (this.rules && !required) {
+        if (Array.isArray(this.rules)) {
+          this.rules.map((item) => {
+            if (item.required) {
+              required = item.required;
+            }
+          });
+        } else if (this.rules.required) {
+          required = this.rules.required;
+        }
+      }
       let minWidth =
         this.label || this.title
           ? (this.label || this.title).length * 14 + 20
@@ -542,7 +564,7 @@ export default {
         ].join(' '),
         labelClassName: [
           this.labelClassName ? this.labelClassName : '',
-          this.required ? 'es-required' : ''
+          required ? 'es-required' : ''
         ].join(' '),
         showOverflowTooltip: this.showOverflowTooltip,
         prop: this.field || this.prop,
@@ -552,7 +574,7 @@ export default {
       return config;
     },
     formOption() {
-      return {
+      let config = {
         labelKey: this.sysCode ? 'shortName' : this.labelKey,
         valueKey: this.sysCode ? 'cciValue' : this.valueKey,
         rules: this.rules,
@@ -560,6 +582,7 @@ export default {
         ...this.$attrs,
         data: this.option
       };
+      return config;
     },
     icon() {
       if (this.filterIcon === true) {
@@ -572,6 +595,7 @@ export default {
       let flag =
         (this.form &&
           [
+            'input',
             'text',
             'textarea',
             'checkbox',
@@ -693,49 +717,53 @@ export default {
     exclAttribute({ data, attrs }) {
       return util.exclAttribute({ data, attrs });
     },
-    format(rows) {
+    format(rows, flag) {
       const field = this.field || this.prop;
       let data = this.option;
+      let str = '';
       if (util.isObject(rows[field])) {
-        return (
+        str =
           rows[field][this.labelKey] ||
           rows[field]['name'] ||
           rows[field]['label'] ||
-          rows[field]['shortName']
-        );
+          rows[field]['shortName'];
       } else if (Array.isArray(rows[field])) {
         const vals = rows[field].map((item) => {
           if (util.isObject(item)) {
-            return (
+            str =
               item[this.labelKey] ||
               item['name'] ||
               item['label'] ||
-              item['shortName']
-            );
+              item['shortName'];
           } else {
             if (data && data.length && util.isObject(data[0])) {
-              return this.getLabel(data, item);
+              str = this.getLabel(data, item);
             }
-            return item;
+            str = item;
           }
         });
-        return vals.join(this.symbol ? this.symbol : '-');
+        str = vals.join(this.symbol ? this.symbol : '-');
       } else {
         if (this.valueToString) {
           const vals = rows[field].split(',').map((item) => {
             if (data && data.length && util.isObject(data[0])) {
-              return this.getLabel(data, item);
+              str = this.getLabel(data, item);
             }
-            return item;
+            str = item;
           });
-          return vals.join(this.symbol ? this.symbol : '-');
+          str = vals.join(this.symbol ? this.symbol : '-');
         } else {
           if (data && data.length && util.isObject(data[0])) {
-            return this.getLabel(data, rows[field]);
+            str = this.getLabel(data, rows[field]);
           }
-          return rows[field];
+          str = rows[field];
         }
       }
+      if (str && flag) {
+        str = str.replace(RegExp('\\n', 'g'), '<br/>');
+        str = str.replace(RegExp(' ', 'g'), '&nbsp;');
+      }
+      return str;
     },
     getLabel(obj, val) {
       for (let i = 0; i < obj.length; i++) {

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

@@ -74,6 +74,7 @@
                 name: name,
                 indexs: index,
                 form: form,
+                readonly: readonly,
                 optionData: optionDatas,
                 ...item
               }"

package/packages/flow/src/main.vue

@@ -442,7 +442,7 @@
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-          v-for="item of btnList.slice(0, 1)"
+          v-for="item of hideBtn? btnList.slice(0,1) : btnList"
           :key="item.name"
           :type="item.type"
           :style="btnStyle"
@@ -457,17 +457,18 @@
             (!isFlow && (rejectObj.fun || pointsReadingObj.fun || moreList))
           "
           placement="top"
+          :class="{'em-flow-more-btn':!hideBtn}"
           trigger="click"
         >
-          <!-- <div v-if="!isFlow" class="es-footer-btn">
-            <div
-              class="es-flow-btn"
-              style="color: red"
+          <div v-if="!isFlow && !hideBtn" class="es-footer-btn">
+            <el-button
               v-if="rejectObj.fun"
               @click="rejectBtn"
+              style="margin-right:10px"
+              type="danger"
             >
-              驳回
-            </div>
+               {{ rejectObj.value }}
+            </el-button>
             <el-button
               v-if="pointsReadingObj.fun"
               class="btn"
@@ -482,8 +483,8 @@
             >
               {{ item.value }}
             </el-button>
-          </div> -->
-          <el-button-group slot="reference" style="margin: 0px 10px">
+          </div>
+          <el-button-group slot="reference" style="margin: 0px 10px" v-if="hideBtn">
             <el-button
               v-show="isSubmitButtonShowAgreeAndDisagree != 1"
               v-for="item of btnList.slice(1)"
@@ -499,7 +500,7 @@
             <el-dropdown
               v-if="
                 !isFlow &&
-                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0)
+                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0) 
               "
               trigger="click"
               placement="top"
@@ -709,6 +710,7 @@ export default {
     typeCode: { type: String, default: '' },
     flowTypeCode: { type: String, default: '' },
     defaultProcessKey: { type: String, default: '' },
+    hideBtn: { type: Boolean, default: false },
     btnList: {
       type: Array,
       default: () => [

package/packages/form/src/main.vue

@@ -13,6 +13,7 @@
       'es-form-table': table,
       'es-form-inside-dialog': dialog
     }"
+    :hide-required-asterisk="hideRequiredAsterisk"
     :inline="inline"
     class="es-form"
     v-loading="loading"
@@ -171,6 +172,7 @@
                   :span="items.span || span"
                   :tableAfter="tableAfter"
                   v-bind="items"
+                  :after="after"
                   :thead="thead"
                   :readonly="readonly"
                   :contents="items.contents"
@@ -3988,6 +3990,10 @@ export default {
       type: Boolean,
       default: true
     },
+    hideRequiredAsterisk: {
+      type: Boolean,
+      default: false
+    },
     after: {
       type: Boolean,
       default: true
@@ -4700,9 +4706,10 @@ export default {
         let month = ageDate.getMonth() + 1;
         let day = ageDate.getDate();
         let age = ageDate.getFullYear() - id.substring(6, 10) - 1;
+        let _month = parseInt(id.substring(10, 12), 10);
         if (
-          id.substring(10, 12) < month ||
-          (id.substring(10, 12) === month && id.substring(12, 14) <= day)
+          _month < month ||
+          (_month === month && id.substring(12, 14) <= day)
         ) {
           age++;
         }
@@ -4756,7 +4763,9 @@ export default {
         }
       }
       if (a.portrait) {
-        let adjunctId = b[0].response.adjunctId;
+        let adjunctId = b[0].response
+          ? b[0].response.adjunctId
+          : b[0].adjunctId;
         this.$set(
           this.models,
           a.name,

package/packages/form/src/table.vue

@@ -97,7 +97,11 @@
               <td
                 v-if="item.label !== false && item.hide !== true"
                 class="es-table-form-label"
-                :class="{ 'es-align-middle': item.labelRow }"
+                :class="{
+                  'es-align-middle': item.labelRow,
+                  'is-required': required && !hideRequiredAsterisk,
+                  'required-after': after
+                }"
                 :key="'label' + index"
                 :align="item.type === 'label' ? item.align : ''"
                 :colspan="
@@ -1102,6 +1106,14 @@ export default {
         return [];
       }
     },
+    hideRequiredAsterisk: {
+      type: Boolean,
+      default: false
+    },
+    after: {
+      type: Boolean,
+      default: true
+    },
     labelWidth: {
       type: [Number, String],
       default: 120
@@ -1215,7 +1227,8 @@ export default {
     return {
       col: this.span ? this.span : 2,
       cols: [],
-      table: []
+      table: [],
+      required: false
     };
   },
   created() {},
@@ -1232,6 +1245,9 @@ export default {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {
           return res.rules.map((item) => {
+            if (item.required) {
+              this.required = item.required;
+            }
             if (rules[item.type]) {
               return {
                 pattern: rules[item.type]['pattern'],
@@ -1263,6 +1279,9 @@ export default {
               : 'blur'
           };
         }
+        if (res.rules.required) {
+          this.required = res.rules.required;
+        }
         return res.rules;
       }
       return undefined;

package/packages/input/src/main.vue

@@ -235,6 +235,11 @@ export default {
       let cls = [];
       let doms = [];
       if (this.readonly) {
+        let content = this.text;
+        if (this.model) {
+          content = this.model.replace(RegExp('\\n', 'g'), '<br/>');
+          content = content.replace(RegExp(' ', 'g'), '&nbsp;');
+        }
         return h(
           'div',
           {
@@ -245,14 +250,7 @@ export default {
               { 'es-plain': this.plain }
             ]
           },
-          [
-            this.model == '' ||
-            this.model == null ||
-            this.model == undefined ||
-            this.model == NaN
-              ? this.text
-              : this.model
-          ]
+          [content]
         );
       }
       if (this.$slots.prefix) {

package/packages/main/src/main.vue

@@ -678,10 +678,13 @@ export default {
       });
     }
     util.win.windowOpen = this.openPage;
+    util.win.addEventListener('popstate', this.stateHandle, false);
   },
   methods: {
+    stateHandle() {
+      util.win.location.reload();
+    },
     menuSuccess(res) {
-      // this.menus
       this.menuType = 'custom';
       if (res && res.length) {
         this.customMenu = res;
@@ -2088,6 +2091,7 @@ export default {
     if (this.webSocket) {
       this.webSocket.destroy();
     }
+    util.win.removeEventListener('popstate', this.tateHandle);
   }
 };
 </script>