@epie/bi-crud 2.0.4 → 2.0.7

package/lib/bi-crud.esm.js

@@ -16166,8 +16166,9 @@ function useApi(_ref5) {
 function useRender$3(ctx) {
   var _useTools = useTools(),
       browser = _useTools.browser,
-      style = _useTools.style; // 渲染表单及表单项
+      style = _useTools.style;
 
+  var baseSpan = ctx.conf.baseSpan || 24; // 渲染表单及表单项
 
   function renderForm() {
     // 表单项列表
@@ -16248,7 +16249,7 @@ function useRender$3(ctx) {
       }
 
       return createVNode(resolveComponent("el-col"), mergeProps({
-        "span": 24
+        "span": baseSpan
       }, e), _isSlot$3(FormItem) ? FormItem : {
         default: function _default() {
           return [FormItem];
@@ -16735,6 +16736,7 @@ var Form = defineComponent({
       props: {
         labelWidth: 100
       },
+      baseSpan: 24,
       on: {},
       op: {
         hidden: false,
@@ -16935,7 +16937,8 @@ var Form = defineComponent({
       } // 显示对话框
 
 
-      visible.value = true; // 合并配置
+      visible.value = true; //;
+      // 合并配置
 
       for (var i in conf) {
         switch (i) {
@@ -16946,9 +16949,14 @@ var Form = defineComponent({
 
           case "title":
           case "width":
+            // case "baseSpan":
             conf[i] = options[i];
             break;
 
+          case "baseSpan":
+            conf.baseSpan = options.baseSpan;
+            break;
+
           case "on":
           case "op":
           case "props":
@@ -18221,8 +18229,7 @@ function useHeight(_ref6) {
         while (n && (n.className || "").includes("el-row")) {
           _h += n.clientHeight + 5;
           n = n.nextSibling;
-        } // debugger;
-        // 设置表格最大高度
+        } // 设置表格最大高度
 
 
         maxHeight.value = r.clientHeight - _h;
@@ -18641,6 +18648,10 @@ var Upsert = defineComponent({
         return [];
       }
     },
+    // 基础span
+    baseSpan: {
+      type: Number
+    },
     // el-form
     props: Object,
     // 编辑时是否同步打开
@@ -18758,6 +18769,7 @@ var Upsert = defineComponent({
           op: props.op,
           dialog: props.dialog,
           items: props.items,
+          baseSpan: props.baseSpan,
           on: {
             open: function open(data) {
               if (props.onOpen) {
@@ -18936,8 +18948,8 @@ var Upsert = defineComponent({
                     return crud.service[reqName]({
                       id: data.id
                     }).then(function (res) {
-                      done(res);
-                      resolve(res);
+                      done(res.data);
+                      resolve(res.data);
                     }).catch(function (err) {
                       ElMessage.error(err.message);
                       reject(err);

package/lib/bi-crud.umd.js

@@ -16169,8 +16169,9 @@
   function useRender$3(ctx) {
     var _useTools = useTools(),
         browser = _useTools.browser,
-        style = _useTools.style; // 渲染表单及表单项
+        style = _useTools.style;
 
+    var baseSpan = ctx.conf.baseSpan || 24; // 渲染表单及表单项
 
     function renderForm() {
       // 表单项列表
@@ -16251,7 +16252,7 @@
         }
 
         return vue.createVNode(vue.resolveComponent("el-col"), vue.mergeProps({
-          "span": 24
+          "span": baseSpan
         }, e), _isSlot$3(FormItem) ? FormItem : {
           default: function _default() {
             return [FormItem];
@@ -16738,6 +16739,7 @@
         props: {
           labelWidth: 100
         },
+        baseSpan: 24,
         on: {},
         op: {
           hidden: false,
@@ -16938,7 +16940,8 @@
         } // 显示对话框
 
 
-        visible.value = true; // 合并配置
+        visible.value = true; //;
+        // 合并配置
 
         for (var i in conf) {
           switch (i) {
@@ -16949,9 +16952,14 @@
 
             case "title":
             case "width":
+              // case "baseSpan":
               conf[i] = options[i];
               break;
 
+            case "baseSpan":
+              conf.baseSpan = options.baseSpan;
+              break;
+
             case "on":
             case "op":
             case "props":
@@ -18224,8 +18232,7 @@
           while (n && (n.className || "").includes("el-row")) {
             _h += n.clientHeight + 5;
             n = n.nextSibling;
-          } // debugger;
-          // 设置表格最大高度
+          } // 设置表格最大高度
 
 
           maxHeight.value = r.clientHeight - _h;
@@ -18644,6 +18651,10 @@
           return [];
         }
       },
+      // 基础span
+      baseSpan: {
+        type: Number
+      },
       // el-form
       props: Object,
       // 编辑时是否同步打开
@@ -18761,6 +18772,7 @@
             op: props.op,
             dialog: props.dialog,
             items: props.items,
+            baseSpan: props.baseSpan,
             on: {
               open: function open(data) {
                 if (props.onOpen) {
@@ -18939,8 +18951,8 @@
                       return crud.service[reqName]({
                         id: data.id
                       }).then(function (res) {
-                        done(res);
-                        resolve(res);
+                        done(res.data);
+                        resolve(res.data);
                       }).catch(function (err) {
                         elementPlus.ElMessage.error(err.message);
                         reject(err);

package/lib/components/upsert/index.d.ts

@@ -5,6 +5,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<EpieForm.Item[]>;
         default: () => never[];
     };
+    baseSpan: {
+        type: NumberConstructor;
+    };
     props: PropType<ElementPlus.FormProps | undefined>;
     sync: BooleanConstructor;
     op: PropType<{
@@ -29,6 +32,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<EpieForm.Item[]>;
         default: () => never[];
     };
+    baseSpan: {
+        type: NumberConstructor;
+    };
     props: PropType<ElementPlus.FormProps | undefined>;
     sync: BooleanConstructor;
     op: PropType<{

package/lib/index.d.ts

@@ -7,4 +7,5 @@ declare const Crud: {
 export default Crud;
 export * from "./emitter";
 export * from "./hooks";
+export * from "./types";
 export { ContextMenu } from "./components/context-menu";

package/lib/types/base/form.d.ts

@@ -46,6 +46,7 @@ export declare namespace EpieForm {
         props?: ElementPlus.FormProps;
         items: Item[];
         form?: any;
+        baseSpan?: number;
         on?: {
             open?(form: any): void;
             close?(done: fun): void;

package/lib/types/base/upsert.d.ts

@@ -1,6 +1,7 @@
 import { EpieForm, fun, EpieCrud } from ".";
 export declare namespace EpieUpsert {
     interface Props {
+        baseSpan?: number;
         items: EpieForm.Item[];
         props?: EpieForm.Options["props"];
         sync?: boolean;

package/lib/types/index.d.ts

@@ -1,3 +1,2 @@
-import "./static/index.scss";
-export * from "./emitter";
+import "../static/index.scss";
 export * from "./base";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epie/bi-crud",
   "simpleName": "bi-crud",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "private": false,
   "main": "lib/bi-crud.umd.js",
   "module": "lib/bi-crud.esm.js",
@@ -86,4 +86,4 @@
     "sass-loader": "^12.6.0",
     "typescript": "^4.6.2"
   }
-}
+}