el-plus 0.0.81 → 0.0.83

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # el-plus
 
+## 0.0.83
+
+### Patch Changes
+
+- 1
+
+## 0.0.82
+
+### Patch Changes
+
+- 1
+
 ## 0.0.81
 
 ### Patch Changes

package/dist/index.css

@@ -1 +1 @@
-.fade-enter-active,.fade-leave-active{transition:opacity .3s ease}.fade-enter-from,.fade-leave-to{opacity:0}body{-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility}.ep-form{position:relative}.ep-form__fold{bottom:23px;color:#367ef5;cursor:pointer;font-size:14px;position:absolute;right:0;text-align:center;width:70px}.ep-form__fold:hover{text-decoration:underline}.ep-form.is-fold{padding-right:70px}.ep-form .el-form-item--small{margin-bottom:18px}.ep-form .el-form-item--small.is-hide-label .el-form-item__label{display:none}.ep-form .el-form-item--small .el-form-item__label{display:block;height:32px;line-height:32px;overflow:hidden;padding-left:18px;padding-right:6px;text-overflow:ellipsis;white-space:nowrap}.ep-form .el-form-item--small .el-form-item__content{font-size:13px;line-height:32px}.ep-form .el-form-item--small .el-form-item__content .el-input{font-size:13px;height:32px}.ep-form .el-form-item--small .el-form-item__content .el-textarea__inner{font-size:13px!important}.ep-form .el-form-item--small .el-form-item__content .el-select__wrapper{font-size:13px;line-height:32px;min-height:32px}.ep-form .el-form-item--small .el-form-item__content .el-date-editor .el-range-input{font-size:13px}.ep-table__action-buttons{white-space:nowrap}.ep-table .el-table{font-size:13px}.ep-table .el-table .el-table__cell .is-edit{cursor:pointer}.ep-table .el-table .el-table__cell .is-edit:hover{color:#409eff}.ep-table .el-table .el-table__cell .is-edit .el-icon{vertical-align:-2px}.ep-table .el-table .el-table__cell.is-center .el-link{margin:0 auto;text-align:center}.ep-table .el-table .cell{line-height:30px}.ep-table .el-table thead tr th{height:42px}.ep-table .el-table thead tr th .cell{line-height:20px}.ep-table .el-table thead tr th .el-checkbox__inner{height:14px;width:14px}.ep-table .el-table td,.ep-table .el-table th{padding:3px 0}.ep-table .el-form-item__error{position:unset;text-align:left}.ep-table .el-form-item{margin-bottom:0}.ep-table .el-form-item .el-form-item__label{padding:0}.ep-table .el-pagination{margin-top:12px;--el-pagination-font-size:13px}.ep-table .el-pagination .el-select{--el-select-font-size:13px}.ep-table .el-pagination .el-select .el-select__wrapper{font-size:13px}.ep-button{height:32px;padding:9px 15px}.ep-button.el-button--text{padding:0}.ep-button.el-button+.el-button{margin-left:10px}.ep-search-list-page #middle{overflow:hidden}.ep-search-list-page__middle-left{float:left}.ep-search-list-page__middle-left>.el-button{margin:16px 0}.ep-search-list-page__middle-right{float:right}.ep-search-list-page__middle-right .el-button{margin:16px 0}.ep-title__header{line-height:50px;overflow:hidden}.ep-title__title{float:left;font-size:15px;font-weight:500}.ep-title__toggle{color:#409eff;cursor:pointer;display:inline-block;font-size:14px;font-weight:400;margin-left:10px;white-space:nowrap}.ep-title__toggle .el-icon{transition:transform .3s;vertical-align:-2px}.ep-title.is-expanded .ep-title__toggle .el-icon{transform:rotate(-180deg)}.ep-title__buttons{float:right}.ep-title__content{overflow:hidden;transition:max-height .3s ease-in-out}.ep-header{display:flex;lex-wrap:wrap}.ep-header>.el-button{margin-bottom:10px}.ep-header .el-page-header .el-page-header__left{margin-right:-10px;margin-top:4px}.ep-header .el-page-header .el-page-header__title{white-space:nowrap}.ep-template-promise{position:relative;z-index:8888888888888888}.ep-dialog{padding:20px 25px 30px}.ep-dialog .el-dialog__headerbtn{height:56px}.ep-dialog .el-dialog__headerbtn .el-dialog__close{transform:scale(1.3)}.ep-dialog .el-dialog__header{text-align:center}.ep-dialog .el-dialog__header .el-dialog__title{color:#505050;font-size:16px;font-weight:600;line-height:24px;margin:4px}.ep-dialog .el-dialog__body{padding:25px 0 0}.ep-dialog__footer button{font-size:12px}.ep-choose-dialog__selected-count{color:#409eff;float:left;font-size:16px;line-height:32px}.ep-confirm-dialog{padding-bottom:20px}.ep-confirm-dialog .ep-dialog__footer{padding-top:0}.ep-custom-column__dialog .el-dialog__body{text-align:center}.ep-custom-column__dialog .el-transfer{display:inline-block}.ep-custom-column__dialog .el-transfer-panel__footer{border-bottom:0;height:0}.ep-custom-column__dialog .el-transfer-panel{overflow:visible}.ep-custom-column__dialog .el-transfer__buttons button{width:100px}.ep-custom-column__dialog .el-transfer__buttons button span{font-size:13px}.ep-custom-column__operate{position:absolute;right:-100%;top:50%;transform:translate(calc(25% - 12px),32px)}.ep-custom-column__operate button{width:100px}.ep-custom-column__operate button span{font-size:13px}.no-cn__operate{transform:translate(calc(25% - 520px),32px)}.ep-link{font-size:13px}.ep-uni-vue{background:#fff}.ep-uni-vue__skeleton .el-skeleton__item{margin-top:10px}.ep-attachment__dialog--normal{background:none;position:static!important}.ep-attachment__dialog--normal .el-overlay-dialog{position:static}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog{margin:0;padding:0;width:auto!important}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog .el-dialog__header{display:none}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog .el-dialog__body{padding:0}.ep-attachment__handler{height:32px;padding:9px 15px}.ep-attachment__handler.el-button--text{padding:0}
+.fade-enter-active,.fade-leave-active{transition:opacity .3s ease}.fade-enter-from,.fade-leave-to{opacity:0}body{-webkit-font-smoothing:antialiased;text-rendering:optimizeLegibility}.ep-form{position:relative}.ep-form__fold{bottom:23px;color:#367ef5;cursor:pointer;font-size:14px;position:absolute;right:0;text-align:center;width:70px}.ep-form__fold:hover{text-decoration:underline}.ep-form.is-fold{padding-right:70px}.ep-form .el-form-item--small{margin-bottom:18px}.ep-form .el-form-item--small.is-hide-label .el-form-item__label{display:none}.ep-form .el-form-item--small .el-form-item__label{display:block;height:32px;line-height:32px;overflow:hidden;padding-left:18px;padding-right:6px;text-overflow:ellipsis;white-space:nowrap}.ep-form .el-form-item--small .el-form-item__content{font-size:13px;line-height:32px}.ep-form .el-form-item--small .el-form-item__content .el-input{font-size:13px;height:32px}.ep-form .el-form-item--small .el-form-item__content .el-textarea__inner{font-size:13px!important}.ep-form .el-form-item--small .el-form-item__content .el-select__wrapper{font-size:13px;line-height:32px;min-height:32px}.ep-form .el-form-item--small .el-form-item__content .el-date-editor .el-range-input{font-size:13px}.ep-table{width:100%}.ep-table__action-buttons{white-space:nowrap}.ep-table .el-table{font-size:13px}.ep-table .el-table .el-table__cell .is-edit{cursor:pointer}.ep-table .el-table .el-table__cell .is-edit:hover{color:#409eff}.ep-table .el-table .el-table__cell .is-edit .el-icon{vertical-align:-2px}.ep-table .el-table .el-table__cell.is-center .el-link{margin:0 auto;text-align:center}.ep-table .el-table .cell{line-height:30px}.ep-table .el-table thead tr th{height:42px}.ep-table .el-table thead tr th .cell{line-height:20px}.ep-table .el-table thead tr th .el-checkbox__inner{height:14px;width:14px}.ep-table .el-table td,.ep-table .el-table th{padding:3px 0}.ep-table .el-form-item__error{position:unset;text-align:left}.ep-table .el-form-item{margin-bottom:0}.ep-table .el-form-item .el-form-item__label{padding:0}.ep-table .el-pagination{margin-top:12px;--el-pagination-font-size:13px}.ep-table .el-pagination .el-select{--el-select-font-size:13px}.ep-table .el-pagination .el-select .el-select__wrapper{font-size:13px}.ep-button{height:32px;padding:9px 15px}.ep-button.el-button--text{padding:0}.ep-button.el-button+.el-button{margin-left:10px}.ep-search-list-page #middle{overflow:hidden}.ep-search-list-page__middle-left{float:left}.ep-search-list-page__middle-left>.el-button{margin:16px 0}.ep-search-list-page__middle-right{float:right}.ep-search-list-page__middle-right .el-button{margin:16px 0}.ep-title{width:100%}.ep-title__header{line-height:50px;overflow:hidden}.ep-title__title{float:left;font-size:15px;font-weight:500}.ep-title__toggle{color:#409eff;cursor:pointer;display:inline-block;font-size:14px;font-weight:400;margin-left:10px;white-space:nowrap}.ep-title__toggle .el-icon{transition:transform .3s;vertical-align:-2px}.ep-title.is-expanded .ep-title__toggle .el-icon{transform:rotate(-180deg)}.ep-title__buttons{float:right}.ep-title__content{overflow:hidden;transition:max-height .3s ease-in-out}.ep-header{display:flex;flex-wrap:wrap}.ep-header>.el-button{margin-bottom:10px}.ep-header .el-page-header .el-page-header__left{margin-right:-10px;margin-top:4px}.ep-header .el-page-header .el-page-header__title{white-space:nowrap}.ep-template-promise{position:relative;z-index:8888888888888888}.ep-dialog{padding:20px 25px 30px}.ep-dialog .el-dialog__headerbtn{height:56px}.ep-dialog .el-dialog__headerbtn .el-dialog__close{transform:scale(1.3)}.ep-dialog .el-dialog__header{text-align:center}.ep-dialog .el-dialog__header .el-dialog__title{color:#505050;font-size:16px;font-weight:600;line-height:24px;margin:4px}.ep-dialog .el-dialog__body{padding:25px 0 0}.ep-dialog__footer button{font-size:12px}.ep-choose-dialog__selected-count{color:#409eff;float:left;font-size:16px;line-height:32px}.ep-confirm-dialog{padding-bottom:20px}.ep-confirm-dialog .ep-dialog__footer{padding-top:0}.ep-custom-column__dialog .el-dialog__body{text-align:center}.ep-custom-column__dialog .el-transfer{display:inline-block}.ep-custom-column__dialog .el-transfer-panel__footer{border-bottom:0;height:0}.ep-custom-column__dialog .el-transfer-panel{overflow:visible}.ep-custom-column__dialog .el-transfer__buttons button{width:100px}.ep-custom-column__dialog .el-transfer__buttons button span{font-size:13px}.ep-custom-column__operate{position:absolute;right:-100%;top:50%;transform:translate(calc(25% - 12px),32px)}.ep-custom-column__operate button{width:100px}.ep-custom-column__operate button span{font-size:13px}.no-cn__operate{transform:translate(calc(25% - 520px),32px)}.ep-link{font-size:13px}.ep-uni-vue{background:#fff}.ep-uni-vue__skeleton .el-skeleton__item{margin-top:10px}.ep-attachment__promise{width:100%}.ep-attachment__dialog--normal{background:none;position:static!important}.ep-attachment__dialog--normal .el-overlay-dialog{position:static}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog{margin:0;padding:0;width:auto!important}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog .el-dialog__header{display:none}.ep-attachment__dialog--normal .el-overlay-dialog .el-dialog .el-dialog__body{padding:0}.ep-attachment__handler{height:32px;padding:9px 15px}.ep-attachment__handler.el-button--text{padding:0}

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! ElPlus v0.0.81 */
+/*! ElPlus v0.0.83 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('element-plus'), require('@vue/shared'), require('axios'), require('js-cookie'), require('defu'), require('qs'), require('element-plus/es/components/table/src/table/defaults'), require('@element-plus/icons-vue'), require('mitt'), require('lodash-unified'), require('@vueuse/core'), require('vue-router'), require('js-base64'), require('vue2'), require('vue-router3'), require('dayjs')) :
@@ -813,16 +813,30 @@
     const clearValidate = (props2) => {
       return elFormRef.value.clearValidate(props2);
     };
+    const formItemRenderRefs = vue.reactive(/* @__PURE__ */ new Map());
+    vue.onBeforeUpdate(() => {
+      formItemRenderRefs.clear();
+    });
+    const getFormItemRenderRef = (refName) => {
+      return formItemRenderRefs.get(refName);
+    };
+    const registerFormItemRenderRef = (refName, ref2) => {
+      if (refName && ref2) {
+        formItemRenderRefs.set(refName, ref2);
+      }
+    };
     return {
       filterFormItemList,
       elFormRef,
       validate,
       resetFields,
-      clearValidate
+      clearValidate,
+      getFormItemRenderRef,
+      registerFormItemRenderRef
     };
   };
 
-  const useFormItemSlots = (props) => {
+  const useFormItemSlots = (props, emit) => {
     const attrs = vue.useAttrs();
     const {
       render,
@@ -863,7 +877,12 @@
           disabled,
           clearable: true,
           ...renderProps,
-          ...events
+          ...events,
+          ref: (el) => {
+            if (el) {
+              emit("registerFormItemRenderRef", el);
+            }
+          }
         }, renderScopedSlots) : formData[prop];
       },
       label: () => {
@@ -973,7 +992,7 @@
       const attrs = vue.useAttrs();
       const {
         scopedSlots
-      } = useFormItemSlots(props);
+      } = useFormItemSlots(props, emit);
       const {
         rules
       } = useFormItemRules(props);
@@ -1023,7 +1042,15 @@
         };
       });
       const formData = vue.useModel(__props, "modelValue");
-      const { filterFormItemList, elFormRef, validate, resetFields, clearValidate } = useForm$1(props);
+      const {
+        filterFormItemList,
+        elFormRef,
+        validate,
+        resetFields,
+        clearValidate,
+        getFormItemRenderRef,
+        registerFormItemRenderRef
+      } = useForm$1(props);
       const { open, toggleStatus, isShowFoldBtn, isShowFormItem } = useCollapse(
         {
           filterFormItemList,
@@ -1036,7 +1063,8 @@
         elFormRef,
         validate,
         resetFields,
-        clearValidate
+        clearValidate,
+        getFormItemRenderRef
       });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", {
@@ -1069,7 +1097,9 @@
                           vue.createVNode(vue.unref(EpFormItem), vue.mergeProps({
                             "form-data": formData.value,
                             "form-label-width": _ctx.labelWidth
-                          }, { ref_for: true }, item), null, 16, ["form-data", "form-label-width"])
+                          }, { ref_for: true }, item, {
+                            onRegisterFormItemRenderRef: (ref2) => vue.unref(registerFormItemRenderRef)(item.props?.ref, ref2)
+                          }), null, 16, ["form-data", "form-label-width", "onRegisterFormItemRenderRef"])
                         ]),
                         _: 2
                       }, 1032, ["class", "span"])), [
@@ -1327,7 +1357,7 @@
       const renderList = () => instances.value.map((props) => {
         return vue.withDirectives(vue.h("div", {
           // key: props.key,
-          class: "ep-template-promise is-init"
+          class: `ep-template-promise is-init ${options.class || ""}`
         }, render ? render(props, ctx) : slots.default?.(props)), [[vue.vShow, props.isVisible]]);
       });
       if (transition) return () => {
@@ -1359,10 +1389,12 @@
       onBeforeCancel,
       cancelText,
       showFooter = true,
+      templatePromiseClass,
       ...dialogProps
     } = options;
     const Dialog = useTemplatePromise({
       destroy: destroyOnClose,
+      class: templatePromiseClass,
       render: (promiseOptions, ctx) => {
         for (const key in scopedSlots) {
           scopedSlots[key] = scopedSlots[key].bind(null, promiseOptions);
@@ -1396,6 +1428,7 @@
           }), scopedSlots.footerInner?.(promiseOptions), vue.createVNode(elementPlus.ElButton, {
             "type": "primary",
             "onClick": async () => {
+              console.log(111);
               if (onBeforeConfirm) {
                 await onBeforeConfirm(resolve);
               }
@@ -1490,11 +1523,6 @@
       const config = {
         method
       };
-      if (cancelToken) {
-        config.cancelRequest = (cancel) => {
-          cancelRequest = cancel;
-        };
-      }
       apiFn = (data = {}, params) => {
         if (config.method === "get") {
           config.params = data;
@@ -1518,29 +1546,38 @@
         if (reqBefore) {
           reqBefore(config);
         }
+        if (cancelToken) {
+          config.cancelToken = new axios.CancelToken(function(cancel) {
+            cancelRequest = cancel;
+          });
+        }
         return http.request(api, config);
       };
     } else {
       apiFn = api;
     }
-    const requestFn = async (data = {}) => {
+    const requestFn = async (data = {}, params) => {
       if (loading.value && !cancelToken) return;
       loading.value = true;
       try {
         cancelRequest && cancelRequest();
-        const res = await apiFn(data);
+        const res = await apiFn(data, params);
         if (reqAfter) {
           reqAfter(res);
         }
         if (hooks?.success) {
           hooks.success(typeof api === "function" ? res : res.data);
         }
+        loading.value = false;
       } catch (error) {
         if (hooks?.fail) {
           hooks.fail(error);
         }
-      } finally {
+        if (axios.isCancel(error)) {
+          return;
+        }
         loading.value = false;
+      } finally {
       }
     };
     return {
@@ -2097,6 +2134,9 @@
     const clearValidate = (props2) => {
       return elFormRef.value.clearValidate(props2);
     };
+    const getSelectionRows = () => {
+      return elTableRef.value.getSelectionRows();
+    };
     const formatActionButtons = (list, scope) => {
       return list.map((item) => {
         if (item.onClick) {
@@ -2118,6 +2158,7 @@
       clearSelection,
       resetFields,
       clearValidate,
+      getSelectionRows,
       elFormRef,
       elTableRef,
       formatActionButtons,
@@ -2373,6 +2414,7 @@
         resetFields,
         clearValidate,
         clearSelection,
+        getSelectionRows,
         loading,
         search,
         elFormRef,
@@ -2394,6 +2436,7 @@
         resetFields,
         clearValidate,
         clearSelection,
+        getSelectionRows,
         search,
         openCustomColumnDialog: () => {
           customColumnRef.value?.open();
@@ -3715,11 +3758,20 @@
       const bem = createNameSpace("attachment");
       const props = __props;
       const modelValue = vue.useModel(__props, "modelValue");
-      const { columns, actionButtons, addAttachment, isNormalOpen, permission, onConfirm, onCancel, mode } = useAttachment(props, {
+      const {
+        columns,
+        actionButtons,
+        addAttachment,
+        isNormalOpen,
+        permission,
+        onConfirm,
+        onCancel,
+        mode
+      } = useAttachment(props, {
         data: modelValue
       });
       const AttachmentDialog = useDialog({
-        width: 850,
+        width: isNormalOpen ? "" : 850,
         center: true,
         title: isNormalOpen ? "" : t("ep.attachment.manageAttachment"),
         modal: !isNormalOpen,
@@ -3730,6 +3782,7 @@
           "dialog",
           props.openType === "normal" ? props.openType : ""
         ),
+        templatePromiseClass: bem.e("promise"),
         onConfirm: async (resolve) => {
           onConfirm(resolve);
         },
@@ -4299,7 +4352,7 @@
     EpUniVue
   ];
 
-  var version = "0.0.81";
+  var version = "0.0.83";
 
   var globalProperties = {
     install(app) {