el-plus 0.0.74 → 0.0.77

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # el-plus
 
+## 0.0.77
+
+### Patch Changes
+
+- 1
+
+## 0.0.76
+
+### Patch Changes
+
+- 1
+
+## 0.0.75
+
+### Patch Changes
+
+- 1
+
 ## 0.0.74
 
 ### 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;margin-bottom:10px}.ep-header .el-page-header .el-page-header__left{margin-right:-10px;margin-top:4px}.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__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}

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! ElPlus v0.0.74 */
+/*! ElPlus v0.0.77 */
 
 (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')) :
@@ -832,7 +832,11 @@
     const events = {};
     for (const key in attrs) {
       if (key.startsWith("on")) {
-        events[key] = attrs[key];
+        events[key] = (...args) => {
+          const tableScope = attrs["table-scope"];
+          const eventFn = attrs[key];
+          return eventFn(...args, tableScope);
+        };
       }
     }
     const formData = attrs["form-data"];
@@ -2340,6 +2344,7 @@
       });
       const customAttrs = vue.computed(() => {
         return {
+          "row-key": props.rowKey || "id",
           ...prepareProps(props, ["modelValue", ...expandTablePropsKeys]),
           // 'tooltip-effect': 'light',
           size: "small",
@@ -2462,7 +2467,7 @@
               _: 1
             }, 8, ["label", "align", "width"])) : vue.createCommentVNode("", true), (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(columnList), (item, index) => {
               return vue.openBlock(), vue.createBlock(_component_el_table_column, vue.mergeProps({
-                key: index
+                key: `${item.prop}_${item.type}_${index}`
               }, {
                 ref_for: true
               }, item), {
@@ -3373,6 +3378,10 @@
     formatColumns: {
       ...tableProps.formatColumns
     },
+    rowKey: {
+      type: String,
+      default: "fileId"
+    },
     // 页面模式
     mode: {
       type: String
@@ -3396,6 +3405,14 @@
     isShowOpenDialogButton: {
       type: Boolean,
       default: false
+    },
+    // 添加前校验
+    beforeAdd: {
+      type: Function
+    },
+    // 权限
+    permission: {
+      type: String
     }
   };
 
@@ -3626,6 +3643,9 @@
       if (isDialogOpen) {
         toBeConfirmData.push(fileData);
       }
+      if (props.beforeAdd) {
+        await props.beforeAdd?.(fileData);
+      }
       data.value.push(fileData);
     };
     const onConfirm = async (resolve) => {
@@ -3652,13 +3672,22 @@
       }
       resolve();
     };
+    const permission = vue.computed(() => {
+      const arr = props.permission?.split(",") || [];
+      return {
+        arg: arr[0],
+        value: arr[1]
+      };
+    });
     return {
       columns,
       addAttachment,
       isNormalOpen,
       isDialogOpen,
       onConfirm,
-      onCancel
+      onCancel,
+      mode,
+      permission
     };
   };
 
@@ -3678,7 +3707,7 @@
       const bem = createNameSpace("attachment");
       const props = __props;
       const modelValue = vue.useModel(__props, "modelValue");
-      const { columns, addAttachment, isNormalOpen, onConfirm, onCancel } = useAttachment(props, {
+      const { columns, addAttachment, isNormalOpen, permission, onConfirm, onCancel, mode } = useAttachment(props, {
         data: modelValue
       });
       const AttachmentDialog = useDialog({
@@ -3710,7 +3739,7 @@
       return (_ctx, _cache) => {
         const _component_EpButtons = vue.resolveComponent("EpButtons");
         return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-          props.isShowOpenDialogButton ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
+          props.isShowOpenDialogButton ? vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElButton), {
             key: 0,
             type: "primary",
             plain: "",
@@ -3722,11 +3751,13 @@
               vue.createTextVNode(vue.toDisplayString(vue.unref(t)("ep.attachment.manageAttachment")) + "(" + vue.toDisplayString(modelValue.value?.length || 0) + ") ", 1)
             ]),
             _: 1
-          }, 8, ["class", "onClick"])) : vue.createCommentVNode("", true),
+          }, 8, ["class", "onClick"])), [
+            [vue.unref(vPermisson), vue.unref(permission)]
+          ]) : vue.createCommentVNode("", true),
           vue.createVNode(vue.unref(AttachmentDialog), null, {
             default: vue.withCtx(() => [
               vue.createElementVNode("div", { style: { "margin-bottom": "10px", "text-align": "right" } }, [
-                props.openType === "dialog" ? (vue.openBlock(), vue.createBlock(_component_EpButtons, {
+                props.openType === "dialog" && vue.unref(mode) !== "browse" ? (vue.openBlock(), vue.createBlock(_component_EpButtons, {
                   key: 0,
                   type: "primary",
                   list: [
@@ -3993,7 +4024,7 @@
     // 组件类型 bpm、 address
   };
 
-  const useUniVue = (props) => {
+  const useUniVue = (props, emit) => {
     const uniVue = vue.useTemplateRef("uniVue");
     const { type } = props;
     const loading = vue.ref(true);
@@ -4022,22 +4053,27 @@
     const prepareVueAttributes = () => {
       const events = {};
       const _props = {};
-      console.log(attrs);
       Object.keys(attrs).forEach((key) => {
         if (key.startsWith("on")) {
           let eventName = key.slice(2);
           if (eventName.startsWith("Update:")) {
             eventName = "update:" + eventName.slice(7);
+            if (eventName === "update:modelValue") {
+              eventName = "input";
+            }
           } else {
             eventName = eventName.replace(/([A-Z])/g, "-$1").toLowerCase();
             eventName = eventName.slice(1);
           }
           events[eventName] = attrs[key];
         } else {
-          _props[key] = attrs[key];
+          if (key === "modelValue") {
+            _props.value = attrs[key];
+          } else {
+            _props[key] = attrs[key];
+          }
         }
       });
-      console.log(events, _props, 9999);
       return {
         on: events,
         props: _props
@@ -4049,7 +4085,7 @@
         case "bpm":
           return `${cdn}bpm-common/common/index.umd.min.js`;
         case "address":
-          return `./hx-address.js`;
+          return `http://localhost:8001/dist/hx-address.js`;
         default:
           return "";
       }
@@ -4141,30 +4177,55 @@
         }
       }
       shadowRoot.appendChild(container);
+      console.log(prepareVueAttributes());
+      const baseEvents = {
+        ...prepareVueAttributes().on,
+        "input": (newVal) => {
+          console.log(newVal, "input", props.name);
+          emit("update:modelValue", newVal);
+        },
+        "update:dialogFormData": (newVal) => {
+          console.log(newVal, "update:dialogFormData");
+          emit("update:dialogFormData", newVal);
+        },
+        "update:visible": (newVal) => {
+          console.log(newVal, "update:visible");
+          emit("update:visible", newVal);
+        }
+      };
       instance = new Vue2({
         el: container,
         // @ts-expect-error 缺少类型定义
         router: new VueRouter3(),
-        render: (h) => h(props.name, prepareVueAttributes())
+        render: (h) => h(props.name, {
+          props: {
+            ...prepareVueAttributes().props
+          },
+          on: baseEvents
+        })
       });
     };
     Object.keys(attrs).forEach((key) => {
-      if (key.startsWith("onUpdate:")) {
-        const propName = key.slice(9);
+      console.log(key, 8);
+      if (!key.startsWith("on")) {
         vue.watch(
-          () => attrs[propName],
+          () => attrs[key],
           (newVal) => {
-            console.log(newVal, "newVal", propName);
-            if (instance) {
+            vue.nextTick(() => {
               try {
-                instance.$children[0][propName] = newVal;
+                console.log(props.name, newVal, "watch", key, instance);
+                let vue2Prop = key;
+                if (key === "modelValue") {
+                  vue2Prop = "value";
+                }
+                instance.$children[0][vue2Prop] = newVal;
               } catch (e) {
               }
-            }
+            });
           },
           {
-            immediate: true,
-            deep: true
+            deep: true,
+            immediate: true
           }
         );
       }
@@ -4184,10 +4245,12 @@
     },
     __name: "uni-vue",
     props: uniVueProps,
-    setup(__props) {
+    emits: ["update:modelValue", "update:dialogFormData", "update:visible"],
+    setup(__props, { emit: __emit }) {
       const bem = createNameSpace("uni-vue");
       const props = __props;
-      const { loading } = useUniVue(props);
+      const emit = __emit;
+      const { loading } = useUniVue(props, emit);
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
           vue.createVNode(vue.unref(elementPlus.ElSkeleton), {
@@ -4226,7 +4289,7 @@
     EpUniVue
   ];
 
-  var version = "0.0.74";
+  var version = "0.0.77";
 
   var globalProperties = {
     install(app) {