ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

package/es/ele-crud/components/table-extra.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, renderSlot, unref, createSlots, renderList, withCtx, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, openBlock, createElementBlock, Fragment, createBlock, unref, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
 import { getFieldsAddFormItems, getFieldsEditFormItems } from "../util";
 import EditModal from "./edit-modal";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -17,6 +17,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     addConfig: [Object, Boolean],
     /** 修改配置 */
     editConfig: [Object, Boolean],
+    /** 列表配置 */
+    listConfig: Object,
     /** 字段数据 */
     fields: Array,
     /** 获取字段数据对应的表单项的方法 */
@@ -30,6 +32,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     addApi: [Function, String],
     /** 修改数据接口 */
     editApi: [Function, String],
+    /** 详情接口 */
+    detailApi: [Function, String],
     /** 高级表单组件类型数据 */
     itemTypeData: Array,
     /** 远程数据源请求工具 */
@@ -56,7 +60,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     /** 修改保存失败事件 */
     editError: (_e) => true,
     /** 修改保存成功事件 */
-    editDone: (_msg) => true
+    editDone: (_msg) => true,
+    /** 详情查询失败事件 */
+    detailError: (_e) => true,
+    /** 详情查询成功事件 */
+    detailDone: (_data) => true
   },
   setup(__props, { emit: __emit }) {
     const slotExcludes = ["default"];
@@ -73,6 +81,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleEditDone = (msg) => {
       emit("editDone", msg);
     };
+    const handleDetailError = (e) => {
+      emit("detailError", e);
+    };
+    const handleDetailDone = (data) => {
+      emit("detailDone", data);
+    };
     const handleUpdateAddVisible = (visible) => {
       emit("update:addVisible", visible);
     };
@@ -87,6 +101,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           modelValue: __props.addVisible,
           title: __props.lang.add,
           editConfig: __props.addConfig === true ? {} : __props.addConfig,
+          listConfig: __props.listConfig,
           fields: __props.fields,
           getFieldsEditFormItems: unref(getFieldsAddFormItems),
           getAndCacheCode: __props.getAndCacheCode,
@@ -109,23 +124,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             };
           })
-        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize"])) : createCommentVNode("", true),
+        ]), 1032, ["data", "modelValue", "title", "editConfig", "listConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize"])) : createCommentVNode("", true),
         __props.editConfig !== false ? (openBlock(), createBlock(EditModal, {
           key: 1,
           data: __props.editData,
           modelValue: __props.editVisible,
           title: __props.lang.edit,
           editConfig: __props.editConfig === true ? {} : __props.editConfig,
+          listConfig: __props.listConfig,
           fields: __props.fields,
           getFieldsEditFormItems: unref(getFieldsEditFormItems),
           getAndCacheCode: __props.getAndCacheCode,
           proFormComponent: __props.proFormComponent,
           editApi: __props.editApi,
+          detailApi: __props.detailApi,
           itemTypeData: __props.itemTypeData,
           httpRequest: __props.httpRequest,
           screenSize: __props.screenSize,
           onEditError: handleEditError,
           onEditDone: handleEditDone,
+          onDetailError: handleDetailError,
+          onDetailDone: handleDetailDone,
           "onUpdate:modelValue": handleUpdateEditVisible
         }, createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots).filter(
@@ -138,7 +157,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             };
           })
-        ]), 1032, ["data", "modelValue", "title", "editConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "itemTypeData", "httpRequest", "screenSize"])) : createCommentVNode("", true),
+        ]), 1032, ["data", "modelValue", "title", "editConfig", "listConfig", "fields", "getFieldsEditFormItems", "getAndCacheCode", "proFormComponent", "editApi", "detailApi", "itemTypeData", "httpRequest", "screenSize"])) : createCommentVNode("", true),
         renderSlot(_ctx.$slots, "default")
       ], 64);
     };

package/es/ele-crud/index.d.ts

@@ -23,6 +23,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     deleteApi: import('vue').PropType<DeleteApi | string>;
     addApi: import('vue').PropType<import('./types').EditApi | string>;
     editApi: import('vue').PropType<import('./types').EditApi | string>;
+    detailApi: import('vue').PropType<import('./types').DetailApi | string>;
     treeListApi: import('vue').PropType<Array<Record<string, any>> | TreeListApi | string>;
     messageOptions: import('vue').PropType<import('../ele-app/plus').EleMessageOptions>;
     itemTypeData: import('vue').PropType<import('../ele-pro-form/types').ProFormItemTypeData[]>;
@@ -61,6 +62,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     deleteApi: import('vue').PropType<DeleteApi | string>;
     addApi: import('vue').PropType<import('./types').EditApi | string>;
     editApi: import('vue').PropType<import('./types').EditApi | string>;
+    detailApi: import('vue').PropType<import('./types').DetailApi | string>;
     treeListApi: import('vue').PropType<Array<Record<string, any>> | TreeListApi | string>;
     messageOptions: import('vue').PropType<import('../ele-app/plus').EleMessageOptions>;
     itemTypeData: import('vue').PropType<import('../ele-pro-form/types').ProFormItemTypeData[]>;

package/es/ele-crud/index.js

@@ -375,6 +375,17 @@ const index = /* @__PURE__ */ defineComponent({
       });
       reloadTable();
     };
+    const handleDetailError = (e) => {
+      const msg = e?.message;
+      if (!msg) {
+        console.error(e);
+      } else {
+        message.error({
+          ...props.messageOptions || {},
+          message: msg
+        });
+      }
+    };
     const handleUpdateAddVisible = (visible) => {
       addVisible.value = visible;
     };
@@ -510,11 +521,13 @@ const index = /* @__PURE__ */ defineComponent({
           "editData": editData.value,
           "addConfig": props.addConfig,
           "editConfig": props.editConfig,
+          "listConfig": props.listConfig,
           "fields": props.fields,
           "getAndCacheCode": getAndCacheCode,
           "proFormComponent": props.proFormComponent,
           "addApi": props.addApi,
           "editApi": props.editApi,
+          "detailApi": props.detailApi,
           "itemTypeData": props.itemTypeData,
           "httpRequest": props.httpRequest,
           "screenSize": props.screenSize,
@@ -524,6 +537,7 @@ const index = /* @__PURE__ */ defineComponent({
           "onAddDone": handleAddDone,
           "onEditError": handleEditError,
           "onEditDone": handleEditDone,
+          "onDetailError": handleDetailError,
           "onUpdate:addVisible": handleUpdateAddVisible,
           "onUpdate:editVisible": handleUpdateEditVisible
         }, {

package/es/ele-crud/props.d.ts

@@ -4,7 +4,7 @@ import { EleMessageOptions } from '../ele-app/plus';
 import { DataItem } from '../ele-data-table/types';
 import { Datasource } from '../ele-pro-table/types';
 import { ProFormItemTypeData, ScreenSize } from '../ele-pro-form/types';
-import { CrudField, ListConfig, SearchConfig, EditConfig, PageConfig, DeleteApi, EditApi, TreeListApi, CrudLocale } from './types';
+import { CrudField, ListConfig, SearchConfig, EditConfig, PageConfig, DeleteApi, EditApi, DetailApi, TreeListApi, CrudLocale } from './types';
 
 /**
  * 属性
@@ -41,6 +41,8 @@ export declare const crudProps: {
     addApi: PropType<EditApi | string>;
     /** 修改数据接口 */
     editApi: PropType<EditApi | string>;
+    /** 详情接口 */
+    detailApi: PropType<DetailApi | string>;
     /** 侧栏树组件数据接口 */
     treeListApi: PropType<Array<Record<string, any>> | TreeListApi | string>;
     /** 消息提示组件属性 */

package/es/ele-crud/props.js

@@ -36,6 +36,8 @@ const crudProps = {
   addApi: [Function, String],
   /** 修改数据接口 */
   editApi: [Function, String],
+  /** 详情接口 */
+  detailApi: [Function, String],
   /** 侧栏树组件数据接口 */
   treeListApi: [Array, Function, String],
   /** 消息提示组件属性 */

package/es/ele-crud/types.d.ts

@@ -204,6 +204,14 @@ export type DeleteApi = (
  */
 export type EditApi = (data: DataItem) => Promise<string | undefined>;
 
+/**
+ * 详情接口
+ */
+export type DetailApi = (
+  dataKey?: DataKey,
+  data?: DataItem
+) => Promise<DataItem>;
+
 /**
  * 侧栏树组件数据接口
  */

package/es/ele-crud-builder/components/body-header.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, createElementBlock, openBlock, createElementVNode, createBlock, createCommentVNode, Fragment, renderList, unref, normalizeClass, withCtx, resolveDynamicComponent, normalizeStyle, createVNode, renderSlot, createTextVNode } from "vue";
+import { defineComponent, ref, computed, openBlock, createElementBlock, createElementVNode, Fragment, renderList, unref, createBlock, normalizeClass, withCtx, resolveDynamicComponent, normalizeStyle, createVNode, createTextVNode, createCommentVNode, renderSlot } from "vue";
 import { ElIcon, ElButton } from "element-plus";
 import { RollbackOutlined, RecoverOutlined, UploadOutlined, DownloadOutlined, DeleteOutlined, CodeOutlined } from "../../icons/index";
 import { screenItems } from "../../ele-pro-form-builder/util";

package/es/ele-crud-builder/components/code-preview.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, createBlock, openBlock, withCtx, createElementVNode, createVNode, unref, normalizeClass, resolveDynamicComponent } from "vue";
+import { defineComponent, ref, watch, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, normalizeClass, resolveDynamicComponent } from "vue";
 import { ElIcon } from "element-plus";
 import { CheckOutlined, CopyOutlined, DownloadOutlined } from "../../icons/index";
 import { copyText, download } from "../../utils/common";

package/es/ele-crud-builder/components/field-list.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementVNode, normalizeClass, createVNode, createCommentVNode, withModifiers, createElementBlock, toDisplayString } from "vue";
+import { defineComponent, resolveComponent, openBlock, createBlock, unref, withCtx, createElementVNode, normalizeClass, createVNode, withModifiers, createCommentVNode, toDisplayString, createElementBlock } from "vue";
 import VueDraggable from "vuedraggable";
 import { ElIcon } from "element-plus";
 import { ArrowDown, DeleteOutlined, CopyOutlined, EditOutlined, PlusOutlined, DragOutlined } from "../../icons/index";

package/es/ele-crud-builder/components/field-tree.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, watch, createElementBlock, openBlock, Fragment, createElementVNode, createBlock, createVNode, unref, withCtx, createTextVNode, Transition, createCommentVNode, toDisplayString, resolveDynamicComponent, createSlots, renderList, mergeProps, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, reactive, watch, openBlock, createElementBlock, Fragment, createElementVNode, createVNode, unref, withCtx, createTextVNode, createBlock, Transition, toDisplayString, resolveDynamicComponent, createSlots, mergeProps, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
 import { ElButton, ElEmpty, ElSwitch } from "element-plus";
 import { PlusOutlined, CloseOutlined, CheckOutlined } from "../../icons/index";
 import { findTree, eachTree, omit } from "../../utils/common";

package/es/ele-crud-builder/components/form-design-modal.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, createBlock, openBlock, withCtx, resolveDynamicComponent, mergeProps, unref, createSlots, createVNode, createTextVNode, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, watch, openBlock, createBlock, withCtx, resolveDynamicComponent, mergeProps, unref, createSlots, createVNode, createTextVNode, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import { ElButton } from "element-plus";
 import { CheckOutlined } from "../../icons/index";
 import EleModal from "../../ele-modal/index";

package/es/ele-crud-builder/components/import-modal.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, createBlock, openBlock, createSlots, withCtx, resolveDynamicComponent, createVNode, unref, createTextVNode } from "vue";
+import { defineComponent, ref, watch, openBlock, createBlock, createSlots, withCtx, resolveDynamicComponent, createVNode, unref, createTextVNode } from "vue";
 import { ElButton } from "element-plus";
 import EleModal from "../../ele-modal/index";
 import { deepCloneObject } from "../../ele-pro-form-builder/components/build-core";

package/es/ele-crud-builder/components/page-config.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, reactive, createElementBlock, openBlock, Fragment, createCommentVNode, createBlock, createVNode, renderList, normalizeClass, toDisplayString, resolveDynamicComponent, createSlots, withCtx, unref, createTextVNode, mergeProps, renderSlot, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, computed, ref, reactive, openBlock, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, createCommentVNode, createBlock, resolveDynamicComponent, createSlots, withCtx, createVNode, unref, createTextVNode, mergeProps, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import { ElButton, ElSwitch } from "element-plus";
 import { FormOutlined } from "../../icons/index";
 import EleProForm from "../../ele-pro-form/index";

package/es/ele-crud-builder/components/template-list.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, createBlock, unref, Fragment, renderList, createElementVNode, toDisplayString, createCommentVNode, resolveDynamicComponent } from "vue";
+import { defineComponent, openBlock, createElementBlock, createBlock, unref, Fragment, renderList, createElementVNode, toDisplayString, resolveDynamicComponent, createCommentVNode } from "vue";
 import { ElEmpty } from "element-plus";
 import { deepCloneObject } from "../../ele-pro-form-builder/components/build-core";
 import { itemsGenerateNewKey } from "../util";

package/es/ele-crud-builder/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, useModel, ref, onBeforeUnmount, createBlock, openBlock, mergeProps, withCtx, createVNode, createElementVNode, createCommentVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, normalizeClass, resolveDynamicComponent } from "vue";
+import { defineComponent, useModel, ref, onBeforeUnmount, openBlock, createBlock, mergeProps, withCtx, createVNode, createElementVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, normalizeClass, resolveDynamicComponent } from "vue";
 import { ElEmpty } from "element-plus";
 import { useMobile } from "../utils/hook";
 import { eachTree, findTree, omit } from "../utils/common";

package/es/ele-crud-builder/style/index.scss

@@ -93,7 +93,7 @@
   overflow: auto;
 }
 
-.ele-crud-builder-header-tool {
+.ele-crud-builder-header-tool.el-icon {
   flex-shrink: 0;
   width: 28px;
   height: 28px;
@@ -337,7 +337,7 @@
   z-index: 1;
 }
 
-.ele-crud-builder-field-item-arrow {
+.ele-crud-builder-field-item-arrow.el-icon {
   flex-shrink: 0;
   width: 16px;
   height: 16px;
@@ -362,8 +362,8 @@
   }
 }
 
-.ele-crud-builder-field-item-tool,
-.ele-crud-builder-field-item-handle {
+.ele-crud-builder-field-item-tool.el-icon,
+.ele-crud-builder-field-item-handle.el-icon {
   flex-shrink: 0;
   width: 20px;
   height: 20px;
@@ -384,7 +384,7 @@
   }
 }
 
-.ele-crud-builder-field-item-handle {
+.ele-crud-builder-field-item-handle.el-icon {
   cursor: move;
 }
 
@@ -663,8 +663,8 @@
     #{eleVarName('tab-bar', 'height')}: 32px;
 
     .ele-tab-item {
-      font-weight: bold;
-      font-family: monospace;
+      font-weight: 500;
+      font-family: $logo-family;
     }
 
     &::before {
@@ -682,6 +682,11 @@
   align-items: flex-start;
   #{eleVarName('scrollbar', 'color')}: #5e5e5e;
   #{eleVarName('scrollbar', 'hover-color')}: #707070;
+
+  & > .ele-code-viewer {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .ele-crud-builder-code-pre {
@@ -689,13 +694,13 @@
   margin: 0;
   padding: 12px;
   box-sizing: border-box;
-  font-family: monospace;
+  font-family: $code-family;
 }
 
 .ele-crud-builder-code-line-numbers {
   flex-shrink: 0;
   color: #8b949e;
-  font-family: monospace;
+  font-family: $code-family;
   padding: 12px 0;
   min-width: 38px;
   background: #1e1e1e;
@@ -707,7 +712,7 @@
   left: 0;
 }
 
-.ele-crud-builder-code-icon-tool {
+.ele-crud-builder-code-icon-tool.el-icon {
   flex-shrink: 0;
   width: 22px;
   height: 22px;

package/es/ele-crud-builder/util.js

@@ -75,7 +75,7 @@ const defaultPageConfigFormItems = [
         props: {
           title: "删除接口设置",
           codeTips,
-          codePlaceholder: `async (data, dataKeys) => {
+          codePlaceholder: `async (dataKeys, data) => {
     // 示例
     const res = await httpRequest.delete('/system/user/batch', {
         data: dataKeys
@@ -123,6 +123,25 @@ const defaultPageConfigFormItems = [
     }
     return Promise.reject(new Error(res.data.message));
 }
+`,
+          codePrefix: codeStringPrefix
+        }
+      },
+      {
+        label: "详情接口",
+        prop: "detailApi",
+        type: "proFormBuilderEventEdit",
+        props: {
+          title: "详情接口设置",
+          codeTips,
+          codePlaceholder: `async (dataKey, data) => {
+    // 示例
+    const res = await httpRequest.get('/system/user/' + dataKey);
+    if (res.data.code === 0) {
+        return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+}
 `,
           codePrefix: codeStringPrefix
         }

package/es/ele-dashboard/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, computed, createElementBlock, openBlock, normalizeStyle, normalizeClass, createElementVNode, renderSlot } from "vue";
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, normalizeClass, createElementVNode, renderSlot } from "vue";
 import { dashboardProps } from "./props";
 const _hoisted_1 = { class: "ele-dashboard-inner" };
 const _sfc_main = /* @__PURE__ */ defineComponent({