ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/lib/ele-crud/components/page-side.cjs

@@ -1,7 +1,6 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const index = require("../../icons/index");
 const common = require("../../utils/common");
 const EleLoading = require("../../ele-loading/index");
 const util = require("../util");
@@ -18,7 +17,14 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     /** 加载错误信息 */
     errorMessage: String,
     /** 选中值 */
-    selectedValue: [String, Number, Boolean, Object, Array]
+    selectedValue: [String, Number, Boolean, Object, Array],
+    /** 侧栏树搜索关键字 */
+    keywords: String,
+    /** 国际化 */
+    lang: {
+      type: Object,
+      required: true
+    }
   },
   emits: {
     /** 侧栏树点击事件 */
@@ -27,21 +33,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const keywords = vue.ref("");
     const treeRef = vue.ref(null);
-    const searchBarProps = vue.computed(() => {
-      var _a;
-      const searchProps = (_a = props.sideConfig) == null ? void 0 : _a.searchProps;
-      if (!searchProps || searchProps === true) {
-        return {};
-      }
-      return searchProps;
-    });
     const setTreeCurrentKey = (key) => {
-      var _a, _b;
       if (key != null) {
         try {
-          (_b = (_a = treeRef.value) == null ? void 0 : _a.setCurrentKey) == null ? void 0 : _b.call(_a, key);
+          treeRef.value?.setCurrentKey?.(key);
         } catch (e) {
           console.error(e);
         }
@@ -59,10 +55,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       return true;
     };
-    vue.watch(keywords, (value) => {
-      var _a, _b;
-      (_b = (_a = treeRef.value) == null ? void 0 : _a.filter) == null ? void 0 : _b.call(_a, value);
-    });
+    vue.watch(
+      () => props.keywords,
+      (value) => {
+        treeRef.value?.filter?.(value);
+      }
+    );
     vue.watch(
       () => props.selectedValue,
       (selected) => {
@@ -73,77 +71,46 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       setTreeCurrentKey(props.selectedValue);
     });
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d;
-      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
-        ((_a = __props.sideConfig) == null ? void 0 : _a.searchProps) !== false ? (vue.openBlock(), vue.createElementBlock("div", vue.mergeProps({
-          key: 0,
-          class: "ele-crud-search-bar"
-        }, searchBarProps.value), [
-          vue.createVNode(vue.unref(elementPlus.ElInput), vue.mergeProps({
-            placeholder: "搜索",
-            clearable: true,
-            modelValue: keywords.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => keywords.value = $event),
-            prefixIcon: vue.unref(index.SearchOutlined)
-          }, ((_b = __props.sideConfig) == null ? void 0 : _b.searchInputProps) || {}), vue.createSlots({ _: 2 }, [
+      return vue.openBlock(), vue.createBlock(EleLoading, vue.mergeProps({
+        loading: __props.loading,
+        class: "ele-crud-tree-wrapper"
+      }, __props.sideConfig?.loadingProps || {}), {
+        default: vue.withCtx(() => [
+          vue.createVNode(vue.unref(elementPlus.ElTree), vue.mergeProps({
+            ref_key: "treeRef",
+            ref: treeRef,
+            data: __props.data,
+            highlightCurrent: true,
+            expandOnClickNode: false,
+            defaultExpandAll: true,
+            filterNodeMethod: filterNode,
+            class: "ele-crud-tree",
+            nodeKey: vue.unref(util.defaultTreeNodeKey)
+          }, __props.sideConfig?.treeProps || {}, { onNodeClick: handleNodeClick }), vue.createSlots({
+            empty: vue.withCtx(() => [
+              vue.createVNode(vue.unref(elementPlus.ElEmpty), vue.mergeProps({
+                imageSize: 68,
+                description: __props.errorMessage
+              }, __props.sideConfig?.emptyProps || {}), null, 16, ["description"])
+            ]),
+            _: 2
+          }, [
             vue.renderList(vue.unref(common.getSlotsMap)(
               _ctx.$slots,
-              (_c = __props.sideConfig) == null ? void 0 : _c.searchInputSlots
-            ), (slotName, name) => {
+              __props.sideConfig?.treeSlots,
+              ["empty"]
+            ), (slotName, compSlotName) => {
               return {
-                name,
+                name: compSlotName,
                 fn: vue.withCtx((slotProps) => [
                   vue.renderSlot(_ctx.$slots, slotName, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
                 ])
               };
             })
-          ]), 1040, ["modelValue", "prefixIcon"])
-        ], 16)) : vue.createCommentVNode("", true),
-        vue.createVNode(EleLoading, vue.mergeProps({
-          loading: __props.loading,
-          class: "ele-crud-tree-wrapper"
-        }, ((_d = __props.sideConfig) == null ? void 0 : _d.loadingProps) || {}), {
-          default: vue.withCtx(() => {
-            var _a2, _b2;
-            return [
-              vue.createVNode(vue.unref(elementPlus.ElTree), vue.mergeProps({
-                ref_key: "treeRef",
-                ref: treeRef,
-                data: __props.data,
-                highlightCurrent: true,
-                expandOnClickNode: false,
-                defaultExpandAll: true,
-                filterNodeMethod: filterNode,
-                class: "ele-crud-tree",
-                nodeKey: vue.unref(util.defaultTreeNodeKey)
-              }, ((_a2 = __props.sideConfig) == null ? void 0 : _a2.treeProps) || {}, { onNodeClick: handleNodeClick }), vue.createSlots({
-                empty: vue.withCtx(() => {
-                  var _a3;
-                  return [
-                    vue.createVNode(vue.unref(elementPlus.ElEmpty), vue.mergeProps({
-                      imageSize: 68,
-                      description: __props.errorMessage
-                    }, ((_a3 = __props.sideConfig) == null ? void 0 : _a3.emptyProps) || {}), null, 16, ["description"])
-                  ];
-                }),
-                _: 2
-              }, [
-                vue.renderList(vue.unref(common.getSlotsMap)(_ctx.$slots, (_b2 = __props.sideConfig) == null ? void 0 : _b2.treeSlots, [
-                  "empty"
-                ]), (slotName, name) => {
-                  return {
-                    name,
-                    fn: vue.withCtx((slotProps) => [
-                      vue.renderSlot(_ctx.$slots, slotName, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-                    ])
-                  };
-                })
-              ]), 1040, ["data", "nodeKey"])
-            ];
-          }),
-          _: 3
-        }, 16, ["loading"])
-      ], 64);
+          ]), 1040, ["data", "nodeKey"])
+        ]),
+        _: 3
+      }, 16, ["loading"]);
     };
   }
 });

package/lib/ele-crud/components/page-side.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
-import { SideConfig } from '../types';
+import { SideConfig, CrudLocale } from '../types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 侧栏配置 */
     sideConfig: PropType<SideConfig>;
@@ -13,6 +13,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     errorMessage: StringConstructor;
     /** 选中值 */
     selectedValue: PropType<any>;
+    /** 侧栏树搜索关键字 */
+    keywords: StringConstructor;
+    /** 国际化 */
+    lang: {
+        type: PropType<Partial<CrudLocale>>;
+        required: true;
+    };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     treeNodeClick: (_nodeValue?: any) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -26,6 +33,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     errorMessage: StringConstructor;
     /** 选中值 */
     selectedValue: PropType<any>;
+    /** 侧栏树搜索关键字 */
+    keywords: StringConstructor;
+    /** 国际化 */
+    lang: {
+        type: PropType<Partial<CrudLocale>>;
+        required: true;
+    };
 }>> & Readonly<{
     onTreeNodeClick?: ((_nodeValue?: any) => any) | undefined;
 }>, {

package/lib/ele-crud/components/table-extra.cjs

@@ -1,7 +1,5 @@
 "use strict";
 const vue = require("vue");
-const common = require("../../utils/common");
-const ElePopconfirm = require("../../ele-popconfirm/index");
 const util = require("../util");
 const EditModal = require("./edit-modal");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
@@ -16,8 +14,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     editVisible: Boolean,
     /** 修改弹窗数据 */
     editData: Object,
-    /** 删除气泡配置 */
-    deletePopOption: Object,
     /** 添加配置 */
     addConfig: [Object, Boolean],
     /** 修改配置 */
@@ -65,15 +61,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   },
   setup(__props, { emit: __emit }) {
     const slotExcludes = ["default"];
-    const props = __props;
     const emit = __emit;
-    const delConfirmRef = vue.ref(null);
-    const delConfirmVirtualRef = vue.ref();
-    const delPopConfirmProps = vue.ref();
-    let delConfirmCurrentData;
-    const handleConfirm = (e) => {
-      emit("btnClick", "delConfirm", e, delConfirmCurrentData);
-    };
     const handleAddError = (e) => {
       emit("addError", e);
     };
@@ -92,35 +80,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const handleUpdateEditVisible = (visible) => {
       emit("update:editVisible", visible);
     };
-    const openDelConfirm = (triggerEl, item, confirmProps) => {
-      if (triggerEl == null || delConfirmVirtualRef.value === triggerEl) {
-        return;
-      }
-      delConfirmRef.value && delConfirmRef.value.hidePopper();
-      vue.nextTick(() => {
-        delPopConfirmProps.value = confirmProps || {};
-        delConfirmVirtualRef.value = triggerEl;
-        delConfirmCurrentData = item;
-        vue.nextTick(() => {
-          var _a, _b;
-          if (delConfirmRef.value) {
-            (_b = (_a = vue.unref(delConfirmRef.value.tooltipRef)) == null ? void 0 : _a.handleOpen) == null ? void 0 : _b.call(_a);
-          }
-        });
-      });
-    };
-    vue.watch(
-      () => props.deletePopOption,
-      (option) => {
-        if (option) {
-          openDelConfirm(
-            option.triggerEl,
-            option.item,
-            common.omit(option.confirmProps, ["isPopConfirm"])
-          );
-        }
-      }
-    );
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         __props.addConfig !== false ? (vue.openBlock(), vue.createBlock(EditModal, {
@@ -137,7 +96,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           itemTypeData: __props.itemTypeData,
           httpRequest: __props.httpRequest,
           screenSize: __props.screenSize,
-          lang: __props.lang,
           onEditError: handleAddError,
           onEditDone: handleAddDone,
           "onUpdate:modelValue": handleUpdateAddVisible
@@ -152,7 +110,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ])
             };
           })
-        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize", "lang"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize"])) : vue.createCommentVNode("", true),
         __props.editConfig !== false ? (vue.openBlock(), vue.createBlock(EditModal, {
           key: 1,
           data: __props.editData,
@@ -167,7 +125,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           itemTypeData: __props.itemTypeData,
           httpRequest: __props.httpRequest,
           screenSize: __props.screenSize,
-          lang: __props.lang,
           onEditError: handleEditError,
           onEditDone: handleEditDone,
           "onUpdate:modelValue": handleUpdateEditVisible
@@ -182,23 +139,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               ])
             };
           })
-        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize", "lang"])) : vue.createCommentVNode("", true),
-        delPopConfirmProps.value ? (vue.openBlock(), vue.createBlock(ElePopconfirm, vue.mergeProps({
-          key: 2,
-          ref_key: "delConfirmRef",
-          ref: delConfirmRef,
-          width: 200,
-          triggerKeys: [],
-          persistent: false,
-          popperOptions: {
-            strategy: "fixed",
-            modifiers: [{ name: "offset", options: { offset: [12, 6] } }]
-          },
-          virtualTriggering: true,
-          virtualRef: delConfirmVirtualRef.value,
-          placement: "top-end",
-          content: __props.lang.deleteConfirm
-        }, delPopConfirmProps.value, { onConfirm: handleConfirm }), null, 16, ["virtualRef", "content"])) : vue.createCommentVNode("", true),
+        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize"])) : vue.createCommentVNode("", true),
         vue.renderSlot(_ctx.$slots, "default")
       ], 64);
     };

package/lib/ele-crud/components/table-extra.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { UserComponent } from '../../ele-app/types';
 import { DataItem } from '../../ele-data-table/types';
 import { ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
-import { EditConfig, BtnClickAction, CrudField, EditApi, DeletePopOption, GetAndCacheCodeFunction, CrudLocale } from '../types';
+import { EditConfig, BtnClickAction, CrudField, EditApi, GetAndCacheCodeFunction, CrudLocale } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
     default?(_: {}): any;
@@ -16,8 +16,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     editVisible: PropType<boolean>;
     /** 修改弹窗数据 */
     editData: PropType<DataItem>;
-    /** 删除气泡配置 */
-    deletePopOption: PropType<DeletePopOption>;
     /** 添加配置 */
     addConfig: PropType<EditConfig | boolean>;
     /** 修改配置 */
@@ -49,9 +47,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     editError: (_e: Error) => void;
     addError: (_e: Error) => void;
-    btnClick: (_action: BtnClickAction, _e: MouseEvent, _item?: DataItem | undefined) => void;
     "update:addVisible": (_visible?: boolean | undefined) => void;
     "update:editVisible": (_visible?: boolean | undefined) => void;
+    btnClick: (_action: BtnClickAction, _e: MouseEvent, _item?: DataItem | undefined) => void;
     addDone: (_msg?: string | undefined) => void;
     editDone: (_msg?: string | undefined) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -63,8 +61,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     editVisible: PropType<boolean>;
     /** 修改弹窗数据 */
     editData: PropType<DataItem>;
-    /** 删除气泡配置 */
-    deletePopOption: PropType<DeletePopOption>;
     /** 添加配置 */
     addConfig: PropType<EditConfig | boolean>;
     /** 修改配置 */
@@ -96,9 +92,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{
     onEditError?: ((_e: Error) => any) | undefined;
     onAddError?: ((_e: Error) => any) | undefined;
-    onBtnClick?: ((_action: BtnClickAction, _e: MouseEvent, _item?: DataItem | undefined) => any) | undefined;
     "onUpdate:addVisible"?: ((_visible?: boolean | undefined) => any) | undefined;
     "onUpdate:editVisible"?: ((_visible?: boolean | undefined) => any) | undefined;
+    onBtnClick?: ((_action: BtnClickAction, _e: MouseEvent, _item?: DataItem | undefined) => any) | undefined;
     onAddDone?: ((_msg?: string | undefined) => any) | undefined;
     onEditDone?: ((_msg?: string | undefined) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;