eoss-ui 0.5.82 → 0.5.84

package/packages/button/src/main.vue

@@ -17,6 +17,7 @@ export default {
     }
   },
   props: {
+    data: {},
     icon: String,
     iconPlacement: {
       type: String,
@@ -46,10 +47,14 @@ export default {
     syncKeys: Object,
     text: String,
     onClick: Function,
-    badge: [Object, Number],
+    badge: [Object, Number, Function],
     float: String,
     selector: Boolean,
-    upload: Boolean
+    upload: Boolean,
+    outside: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     _type() {
@@ -266,6 +271,7 @@ export default {
     let attrs = {};
     let listeners = {};
     let config = {};
+    let badgeConfig;
     if (this.selector) {
       tag = 'es-selector';
       props = {
@@ -300,44 +306,66 @@ export default {
         ]);
       }
       if (this.badge) {
-        let config = {};
         if (typeof this.badge === 'number') {
-          config = { class: 'es-button-badge', props: { value: this.badge } };
+          badgeConfig = {
+            class: 'es-button-badge',
+            props: { value: this.badge }
+          };
+        } else if (typeof this.badge === 'function') {
+          let badge = this.badge(this.data);
+          if (badge) {
+            if (typeof badge === 'number') {
+              badgeConfig = {
+                class: 'es-button-badge',
+                props: { value: badge }
+              };
+            } else {
+              let { value, max, isDot, hidden, type } = badge;
+              badgeConfig = {
+                class: this.badge.class
+                  ? this.badge.class + ' es-button-badge'
+                  : 'es-button-badge',
+                props: { value, max, isDot, hidden, type }
+              };
+            }
+          }
         } else {
           let { value, max, isDot, hidden, type } = this.badge;
-          config = {
+          badgeConfig = {
             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 }) : ''
+        if (badgeConfig && Object.keys(badgeConfig).length && this.outside) {
+          return h('el-badge', badgeConfig, [
+            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(
@@ -354,31 +382,36 @@ export default {
           }
         ]
       },
-      this.iconPlacement === 'start'
-        ? [
-            this.icon ? h('i', { class: this.icon }) : '',
-            this.upload
-              ? h(
-                  'el-button',
-                  {
-                    props: config
-                  },
-                  [this.$slots.default || this.text]
-                )
-              : this.$slots.default || this.text
-          ]
-        : [
-            this.upload
-              ? h(
-                  'el-button',
-                  {
-                    props: config
-                  },
-                  [this.$slots.default || this.text]
-                )
-              : this.$slots.default || this.text,
-            this.icon ? h('i', { class: this.icon }) : ''
-          ]
+      [
+        ...(this.iconPlacement === 'start'
+          ? [
+              this.icon ? h('i', { class: this.icon }) : '',
+              this.upload
+                ? h(
+                    'el-button',
+                    {
+                      props: config
+                    },
+                    [this.$slots.default || this.text]
+                  )
+                : this.$slots.default || this.text
+            ]
+          : [
+              this.upload
+                ? h(
+                    'el-button',
+                    {
+                      props: config
+                    },
+                    [this.$slots.default || this.text]
+                  )
+                : this.$slots.default || this.text,
+              this.icon ? h('i', { class: this.icon }) : ''
+            ]),
+        !this.outside && badgeConfig && Object.keys(badgeConfig).length
+          ? h('el-badge', badgeConfig)
+          : ''
+      ]
     );
   }
 };

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

@@ -21,6 +21,8 @@
           <es-button
             v-else
             :stop="stop"
+            :data="data"
+            :outside="outside"
             v-bind="
               exclAttribute({
                 data: item,
@@ -50,17 +52,19 @@
       :trigger="trigger"
     >
       <el-button :size="size" :type="mode == 'plus' ? 'text' : ''">
-        <template v-if="mode == 'plus'">更多</template>
-        <template v-else-if="moreText">
-          {{ moreText }}
-          <i
-            :class="{
-              'el-icon-arrow-down': !show,
-              'el-icon-arrow-up': show
-            }"
-          ></i>
-        </template>
-        <i v-else class="es-icon-omit"></i>
+        <el-badge v-bind="badges">
+          <template v-if="mode == 'plus'">更多</template>
+          <template v-else-if="moreText">
+            {{ moreText }}
+            <i
+              :class="{
+                'el-icon-arrow-down': !show,
+                'el-icon-arrow-up': show
+              }"
+            ></i>
+          </template>
+          <i v-else class="es-icon-omit"></i>
+        </el-badge>
       </el-button>
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item
@@ -114,6 +118,14 @@
                 : item.text
             }}
           </template>
+          <el-badge
+            v-if="item.badge"
+            v-bind="
+              typeof item.badge === 'number'
+                ? { value: item.badge }
+                : item.badge
+            "
+          ></el-badge>
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -153,7 +165,13 @@ export default {
       type: String,
       default: 'bottom'
     },
-    parseData: Function
+    parseData: Function,
+    badge: Object,
+    sort: Boolean,
+    outside: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     btns() {
@@ -170,6 +188,19 @@ export default {
           ? this.btns.slice(this.length - 1, this.btns.length)
           : [];
       return btns;
+    },
+    badges() {
+      if (
+        this.other.length &&
+        this.other.filter((item) => {
+          return item.badge;
+        }).length
+      ) {
+        return this.badge ? { isDot: true, ...this.badge } : { isDot: true };
+      }
+      return this.badge
+        ? { isDot: true, hidden: true, ...this.badge }
+        : { isDot: true, hidden: true };
     }
   },
   watch: {},
@@ -215,7 +246,19 @@ export default {
         }
         return true;
       });
-      return arry;
+      let newBtns = arry.map((item) => {
+        let badge;
+        if (item.badge && typeof item.badge === 'function') {
+          badge = item.badge(this.data.row);
+        }
+        return badge ? { ...item, badge: badge } : { ...item };
+      });
+      if (this.sort) {
+        newBtns = newBtns.sort((a, b) => {
+          return (b.badge ? 1 : 0) - (a.badge ? 1 : 0);
+        });
+      }
+      return newBtns;
     },
     handleChange(res) {
       this.show = res;

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

@@ -602,6 +602,10 @@ export default {
           required = this.rules.required;
         }
       }
+      if (this.type === 'handle') {
+        config.sort = true;
+        config.outside = false;
+      }
       let minWidth =
         this.label || this.title
           ? (this.label || this.title).length * 14 + 20

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

@@ -77,7 +77,7 @@
           (theadBorder && border != 'none' ? ' es-thead-border' : '')
         "
       >
-        <slot name="prepend"></slot>
+        <slot name="suffix"></slot>
         <slot></slot>
         <template v-for="(item, index) in theads">
           <template v-if="item.hide !== true">
@@ -120,7 +120,7 @@
             ></children>
           </template>
         </template>
-        <slot name="append"></slot>
+        <slot name="prefix"></slot>
         <el-table-column
           v-if="editable && !readonly"
           width="80"
@@ -149,6 +149,7 @@
             </el-button>
           </template>
         </el-table-column>
+        <template slot="append"><slot name="append"></slot></template>
       </el-table>
       <div v-if="infiniteScroll" class="es-table-page es-loading-page">
         <span>共{{ config.totalCount }}条，</span>
@@ -182,8 +183,7 @@ import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
-const dataTableMode =
-  util.win.top.dataTableMode || util.win.dataTableMode || 'default';
+const systemMode = util.win.top.systemMode || util.win.systemMode || 'default';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -211,7 +211,7 @@ export default {
   props: {
     mode: {
       type: String,
-      default: dataTableMode
+      default: systemMode
     },
     service: String,
     loading: {
@@ -723,8 +723,7 @@ export default {
       }
     },
     param: {
-      deep: true,
-      handler() {
+      handler(val) {
         this.getTableData();
       }
     },

package/packages/dialog/src/main.vue

@@ -11,7 +11,11 @@
     :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
     v-on="{ ...$listeners, close: handleClosed, scale: handleScale }"
-    :class="{ 'is-middle': middle }"
+    :class="{
+      'es-dialog-plus': mode == 'plus',
+      'is-middle': middle,
+      'es-title-hide': !titles
+    }"
     :append-to-body="appendToBody"
     :id="wujieName"
     :ref="wujieName"
@@ -268,6 +272,7 @@ let availWidth = 0;
 let availHeight = 0;
 availWidth = util.win.top.document.body.offsetWidth - 260;
 availHeight = util.win.top.document.body.offsetHeight - 60;
+const systemMode = util.win.top.systemMode || util.win.systemMode || 'default';
 export default {
   name: 'EsDialog',
   inheritAttrs: false,
@@ -289,6 +294,10 @@ export default {
     }
   },
   props: {
+    mode: {
+      type: String,
+      default: systemMode
+    },
     title: String,
     busEvent: String,
     contents: [Array, Object],

package/packages/flow/src/main.vue

@@ -562,19 +562,20 @@
     </div>
     <!-- 弹窗内容 -->
     <es-dialog
+      v-if="handleVisible"
       append-to-body
+      height="auto"
+      ref="handleVisible"
       :title="title"
       :close-on-click-modal="false"
       :visible.sync="handleVisible"
-      v-if="handleVisible"
       :closeParent="closeParent"
-      height="auto"
     >
       <ProcessForm
         :id="businessIds"
         :process-definition-id="nodeInfo.nextNode"
         :opinion="value"
-        @cancel="closeProcess($event, 'handleVisible')"
+        @cancel="closeProcess($event, 'handleVisible', closeParent)"
       />
     </es-dialog>
     <es-dialog
@@ -592,11 +593,12 @@
       />
     </es-dialog>
     <es-dialog
-      append-to-body
-      :close-on-click-modal="false"
-      title="驳回"
       v-if="showReject"
+      append-to-body
       height="auto"
+      title="驳回"
+      ref="showReject"
+      :close-on-click-modal="false"
       :visible.sync="showReject"
     >
       <ProcessReject
@@ -608,12 +610,13 @@
       />
     </es-dialog>
     <es-dialog
+      v-if="showTaskRead"
       append-to-body
+      height="auto"
+      ref="showTaskRead"
       :close-on-click-modal="false"
       :title="taskReadType === 'transfer' ? '转办' : '分阅'"
       :visible.sync="showTaskRead"
-      height="auto"
-      v-if="showTaskRead"
     >
       <StartTaskRead
         :pending-id="pendingId"
@@ -625,11 +628,11 @@
       />
     </es-dialog>
     <es-dialog
+      v-if="showFileList"
       append-to-body
-      :close-on-click-modal="false"
       title="意见附件"
+      :close-on-click-modal="false"
       :visible.sync="showFileList"
-      v-if="showFileList"
     >
       <FileList
         :ownId="pendingId"
@@ -638,12 +641,13 @@
       />
     </es-dialog>
     <es-dialog
+      v-if="showSendMsg"
       append-to-body
-      :close-on-click-modal="false"
+      height="auto"
       title="发送消息"
+      ref="showSendMsg"
+      :close-on-click-modal="false"
       :visible.sync="showSendMsg"
-      height="auto"
-      v-if="showSendMsg"
     >
       <SendMsg
         @cancel="closeProcess($event, 'showSendMsg')"
@@ -652,12 +656,13 @@
       />
     </es-dialog>
     <es-dialog
+      v-if="showTaskUnionExamine"
       append-to-body
+      height="auto"
+      ref="showTaskUnionExamine"
       :close-on-click-modal="false"
       :title="flowTitle"
       :visible.sync="showTaskUnionExamine"
-      height="auto"
-      v-if="showTaskUnionExamine"
     >
       <TaskUnionExamine
         @cancel="closeProcess($event, 'showTaskUnionExamine')"
@@ -2272,8 +2277,12 @@ export default {
      * @param {String} type 当前点击的弹窗类型
      * @date 2022年5月25日
      **/
-    closeProcess(val, type) {
-      this[type] = false;
+    closeProcess(val, type, closeParent) {
+      if (closeParent) {
+        this.$refs[type].handleClosed();
+      } else {
+        this[type] = false;
+      }
       if (
         val == 'taskReadAndEnd' ||
         (val == true && type != 'taskRead') ||

package/packages/form/src/main.vue

@@ -25,6 +25,12 @@
     v-on="$listeners"
   >
     <input type="text" style="display: none" v-if="forbid" />
+    <input
+      type="password"
+      class="hidden-input"
+      autocomplete="new-password"
+      v-if="!autocomplete"
+    />
     <es-steps
       v-if="steps"
       class="es-steps-group"
@@ -4071,6 +4077,10 @@ export default {
     }
   },
   props: {
+    autocomplete: {
+      type: Boolean,
+      default: true
+    },
     hides: {
       type: Array,
       default() {

package/packages/login/src/resetPassword.vue

@@ -26,9 +26,10 @@
       element-loading-text="修改中..."
       element-loading-spinner="el-icon-loading"
       element-loading-background="rgba(0, 0, 0, 0.65)"
+      class="es-user-info"
       :model="formData"
       :contents="page"
-      class="es-user-info"
+      :autocomplete="false"
       @submit="handleSubmit"
     >
     </es-form>
@@ -369,6 +370,8 @@ export default {
       if (types.length) {
         this.activeIndex = types[0];
       }
+    } else {
+      this.activeIndex = '0';
     }
   },
   destroyed() {
@@ -499,7 +502,6 @@ export default {
             } else {
               let msg = res.msg || '系统错误，请联系管理员！';
               this.$message.error(msg);
-              this.btnText = '获取验证码';
               this.disabled = false;
               delete this.formData.verificationCode;
               clearInterval(this.timer);

package/packages/main/src/default/userinfo.vue

@@ -1,9 +1,10 @@
 <template>
   <es-form
     ref="form"
+    class="es-user-info"
     :model="values"
     :contents="forms"
-    class="es-user-info"
+    :autocomplete="false"
     @change="handleFormChange"
     @submit="handleFormSubmit"
   >