eoss-ui 0.5.83 → 0.5.85

package/lib/wxlogin.js

@@ -2021,11 +2021,24 @@ var identical = function identical(_ref7) {
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (typeof target === 'string' && arry[i][key] === target) {
-        return i;
-      }
-      if (target[key] === arry[i][key]) {
-        return i;
+      if (key.indexOf(',') > -1) {
+        var keys = key.split(',');
+        for (var n = 0; n < keys.length; n++) {
+          var k = keys[n];
+          if (typeof target === 'string' && arry[i][k] === target) {
+            return i;
+          }
+          if (target[k] === arry[i][k]) {
+            return i;
+          }
+        }
+      } else {
+        if (typeof target === 'string' && arry[i][key] === target) {
+          return i;
+        }
+        if (target[key] === arry[i][key]) {
+          return i;
+        }
       }
     } else {
       if (JSON.stringify(target) === JSON.stringify(arry[i])) {
@@ -3255,7 +3268,7 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "n", function() { return doQrLogin; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "eb", function() { return logout; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "X", function() { return initLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return switchUserTo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return switchUserTo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "c", function() { return changeImg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "F", function() { return getLoginCode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "m", function() { return doCodeLogin; });
@@ -3273,12 +3286,12 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "qb", function() { return scanCodeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "e", function() { return codeRetrialAuth; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "k", function() { return doAssistanceQrLogin; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return userOnline; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ec", function() { return userOnline; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "S", function() { return getUserAppWithTag; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mb", function() { return recordUserApp; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fb", function() { return mainConfig; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ab", function() { return initUserSet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Yb", function() { return updateUserInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Zb", function() { return updateUserInfo; });
 /* unused harmony export getUserImgUrl */
 /* unused harmony export getDoorIndex */
 /* unused harmony export refreshOnlineUsers */
@@ -3287,17 +3300,18 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "B", function() { return getComplexApplications; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "C", function() { return getComplexApplicationsNew; });
 /* unused harmony export getUserCustomInfo */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateUserCustomInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "wb", function() { return sysMsgPage; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Yb", function() { return updateUserCustomInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return sysMsgPage; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "W", function() { return ignoreSysMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "V", function() { return ignoreAllSysMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return searchType; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "A", function() { return getAdjunctProperties; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return uploads; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ac", function() { return uploadOnlyOne; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "dc", function() { return uploads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bc", function() { return uploadOnlyOne; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "z", function() { return getAdjunctFileInfos; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bc", function() { return uploadSort; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "cc", function() { return uploadSort; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "r", function() { return downloadByAdjunctId; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Zb", function() { return uploadDownloads; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ac", function() { return uploadDownloads; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "jb", function() { return previewAdjunct; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "kb", function() { return previewAdjunct2; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "lb", function() { return previewAdjunctOffice; });
@@ -3315,13 +3329,13 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "T", function() { return gethelpdoc; });
 /* unused harmony export getCurrentuser */
 /* unused harmony export mainDetail */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toStartFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return tempSave; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toStartFlow; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return tempSave; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "f", function() { return commonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return addCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "s", function() { return editCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "pb", function() { return saveCommonOpinion; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Wb", function() { return updateCommonOpinion; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Xb", function() { return updateCommonOpinion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "h", function() { return deleteCommonOpion; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "M", function() { return getProcessDefList; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "H", function() { return getNodeInfo; });
@@ -3330,52 +3344,52 @@ var watermark = function watermark(option) {
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "w", function() { return findSysCodes; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "I", function() { return getNotificationMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "E", function() { return getHandleInfoHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "xb", function() { return taskHandleHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return taskHandleHtml; });
 /* unused harmony export getView */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "nb", function() { return register; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "gb", function() { return pendedhistoryList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return toTaskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return taskRejectHtml; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Kb", function() { return toStartTaskRead; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toStartTaskReadIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "yb", function() { return taskReadHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return toTaskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return taskRejectHtml; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Lb", function() { return toStartTaskRead; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Mb", function() { return toStartTaskReadIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "zb", function() { return taskReadHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ob", function() { return rejectAndEnd; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toSendMsg; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return sendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Jb", function() { return toSendMsg; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "vb", function() { return sendMsg; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "t", function() { return endFlowHtml; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "U", function() { return handleInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "db", function() { return loginUserInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ec", function() { return wss; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return topic; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fc", function() { return wss; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return topic; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "K", function() { return getPresetCustomInfo; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "L", function() { return getPresetNodeInfo; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return toTaskTransferIndex; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return taskTransfer; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Hb", function() { return toPresetInfoListIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return toTaskTransferIndex; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return taskTransfer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ib", function() { return toPresetInfoListIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "j", function() { return deletePresetInfo; });
 /* unused harmony export historyListJson */
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hb", function() { return pendedhistoryListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ib", function() { return pressListJson; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "i", function() { return deleteFlow; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "bb", function() { return isCanStartSubFlow; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Rb", function() { return toTaskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Eb", function() { return taskUnionExamine; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return toTaskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return taskTakeAdvice; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return toTaskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return taskStartDraft; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Nb", function() { return toTaskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ab", function() { return taskReview; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return toTaskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return taskUnionSeal; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return toTwoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Vb", function() { return twoOfficesDispatch; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return sendList; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return sendInfo; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sb", function() { return toTaskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Fb", function() { return taskUnionExamine; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Qb", function() { return toTaskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Db", function() { return taskTakeAdvice; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Pb", function() { return toTaskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Cb", function() { return taskStartDraft; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ob", function() { return toTaskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Bb", function() { return taskReview; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Tb", function() { return toTaskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Gb", function() { return taskUnionSeal; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Ub", function() { return toTwoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Wb", function() { return twoOfficesDispatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ub", function() { return sendList; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tb", function() { return sendInfo; });
 /* unused harmony export sendSave */
 /* unused harmony export sendUpdate */
 /* unused harmony export sendDelete */
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "rb", function() { return sendBatch; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "sb", function() { return sendBatch; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "y", function() { return formContents; });
 // 登录
 var doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
@@ -3422,6 +3436,9 @@ var updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更新主题
 var sysMsgPage = '/main2/notify/sysMsgPage'; // 获取系统消息
 var ignoreSysMsg = '/main2/notify/ignoreSysMsg'; // 忽略系统消息
 var ignoreAllSysMsg = '/main2/notify/ignoreAllSysMsg'; // 忽略全部系统消息
+// 框架 - 搜索
+var searchType = '/oceansearch/v2/search/catalog'; // 搜索分类类型
+
 // 附件相关
 var getAdjunctProperties = '/main2/mecpfileManagement/getAdjunctProperties'; // 获取附件扩展类型大小
 var uploads = '/main2/mecpfileManagement/upload'; // 上传接口
@@ -3596,7 +3613,8 @@ var sendDelete = '/notify2/notifySendRecord/deleteById';
 var sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
 
 // 表单结构
-var formContents = '/config/admin/online/onlineForm/render';
+
+var formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';
 
 /***/ }),
 

package/package.json

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

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/children.vue

@@ -4,7 +4,7 @@
       <template v-for="(item, index) in childrens">
         <children
           v-if="item.hide !== true"
-          :key="index"
+          :key="item.key || item.id || item.label || item.title || index"
           v-bind="{
             ...$attrs,
             ...item,
@@ -22,13 +22,14 @@ import column from './column.vue';
 export default {
   name: 'Children',
   components: {
-    [column.name]: column
+    column
   },
   props: {
     dragSort: Boolean,
     children: Array,
     childHead: Array
   },
+  created() {},
   computed: {
     childrens() {
       return this.children || this.childHead || [];

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

@@ -1,5 +1,5 @@
 <template>
-  <el-table-column v-bind="config">
+  <el-table-column v-bind="config" :key="field">
     <slot> </slot>
     <template slot-scope="scope">
       <template v-if="isForm && !isReadOnly(scope)">
@@ -585,7 +585,6 @@ export default {
         label: this.label || this.title,
         width: this.btnWidth || this.width
       };
-
       if (this.type === 'expand') {
         config = { type: this.type, ...config, ...this.$attrs };
         return config;
@@ -602,13 +601,17 @@ 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
           : this.width
           ? ''
           : '180px';
-      config = {
+      return {
         ...config,
         filterIcon: this.icon,
         sortable: this.sortable || this.sort,
@@ -627,7 +630,6 @@ export default {
         field: this.field,
         ...this.$attrs
       };
-      return config;
     },
     formOption() {
       let config = {