@vue-start/element-pro 0.1.2 → 0.2.2

package/dist/index.es.js

@@ -1,8 +1,8 @@
-import { defineComponent, createVNode, Fragment, mergeProps, isVNode, ref, reactive, toRaw, computed } from 'vue';
-import { ElTableColumn, ElTable, ElPagination, ElRow, ElCol, ElFormItem, ElForm, ElSelect, ElOption, ElInput, ElInputNumber, ElDatePicker, ElTimePicker, ElTreeSelect, ElCheckboxGroup, ElRadioGroup, ElSwitch, ElCascader, ElButton, ElDescriptions, ElDescriptionsItem, ElDialog } from 'element-plus';
-import { map, omit, get, keys, pick, isNumber, merge, size, isUndefined, mergeWith, isArray, concat } from 'lodash';
-import { useProTable, ProTable as ProTable$1, ProForm as ProForm$1, getFormItemEl, getColumnFormItemName, getValidValues, ProSearchForm as ProSearchForm$1, createFormItemCompFn, useProForm, ProFormList as ProFormList$1, useProCurd, CurdAddAction, CurdCurrentMode, useProModule, CurdAction, CurdSubAction } from '@vue-start/pro';
-import { setReactiveValue } from '@vue-start/hooks';
+import { defineComponent, createVNode, mergeProps, reactive, ref, toRaw, isVNode } from 'vue';
+import { ElRow, ElCol, ElLoading, ElFormItem, ElForm, ElSelect, ElOption, ElRadioGroup, ElRadioButton, ElRadio, ElInput, ElInputNumber, ElDatePicker, ElTimePicker, ElTreeSelect, ElCheckboxGroup, ElSwitch, ElCascader, ElButton, ElTable, ElTableColumn, ElPagination, ElDescriptions, ElDescriptionsItem, ElDialog } from 'element-plus';
+import { isString, keys, omit, map, get } from 'lodash';
+import { createGrid, generateId, createExpose, createForm, createSearchForm, createFormItemCompFn, useProForm, createFormList, createTable, createCurdForm, CurdCurrentMode, useProCurd, createCurdList, createCurdDesc, CurdAction } from '@vue-start/pro';
+import { useEffect, setReactiveValue } from '@vue-start/hooks';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -78,213 +78,95 @@ function _nonIterableSpread() {
   throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
-var Content = defineComponent(function () {
-  var _useProTable = useProTable(),
-      columns = _useProTable.columns;
-
-  return function () {
-    return createVNode(Fragment, null, [map(columns.value, function (item) {
-      var formatter = function formatter(record, column, value, index) {
-        if (item.customRender) {
-          return item.customRender({
-            value: value,
-            text: value,
-            record: record,
-            column: column,
-            index: index
-          });
-        }
-
-        return value;
-      };
-
-      return createVNode(ElTableColumn, mergeProps({
-        "key": item.dataIndex
-      }, omit(item, "title", "label", "renderHeader", "prop", "dataIndex", "formatter", "customRender"), {
-        "label": isVNode(item.title) ? undefined : item.title || get(item, "label"),
-        "renderHeader": isVNode(item.title) ? function () {
-          return item.title;
-        } : undefined,
-        "prop": item.dataIndex,
-        "formatter": formatter
-      }), null);
-    })]);
-  };
-});
-var ProTable = defineComponent({
-  inheritAttrs: false,
-  props: _objectSpread2(_objectSpread2({}, ElTable.props), ProTable$1.props),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        expose = _ref.expose,
-        attrs = _ref.attrs;
-    var tableRef = ref();
-    var originKeys = keys(ProTable$1.props);
-    return function () {
-      var _slots$default;
-
-      return createVNode(ProTable$1, mergeProps(attrs, pick.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["provideExtra"])), {
-        "provideExtra": _objectSpread2({
-          tableRef: tableRef
-        }, props.provideExtra)
-      }), {
-        "default": function _default() {
-          return [createVNode(ElTable, mergeProps({
-            "ref": function ref(el) {
-              expose(el);
-              tableRef.value = el;
-            }
-          }, omit(props, originKeys)), _objectSpread2({
-            "default": function _default() {
-              return [createVNode(Content, null, null), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-            }
-          }, omit(slots, "default")))];
-        }
-      });
-    };
-  }
-});
+var ProGrid = createGrid(ElRow, ElCol);
 
-var defaultPage = {
-  page: 1,
-  pageSize: 10
+var createLoadingId = function createLoadingId() {
+  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "comp";
+  return prefix + "-" + generateId();
 };
 
-var proListProps = function proListProps() {
+var proLoadingProps = function proLoadingProps() {
   return {
-    /**
-     * extra 是否放到SearchForm中
-     */
-    extraInSearch: {
-      type: Boolean,
-      "default": undefined
+    loading: {
+      type: Boolean
     },
-    //search
-    searchProps: {
-      type: Object
+    target: {
+      type: [String, Object]
     },
-    //table
-    tableProps: {
-      type: Object
+    body: {
+      type: Boolean
     },
-    //pagination
-    paginationProps: {
-      type: Object
+    fullscreen: {
+      type: Boolean
     },
-    //pageState
-    pageState: {
-      type: Object
+    lock: {
+      type: Boolean
+    },
+    text: {
+      type: String
+    },
+    spinner: {
+      type: String
+    },
+    background: {
+      type: String
+    },
+    customClass: {
+      type: String
     }
   };
 };
 
-var ProList = defineComponent({
-  props: _objectSpread2({}, proListProps()),
+var ProLoading = defineComponent({
+  props: _objectSpread2({}, proLoadingProps()),
   setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        emit = _ref.emit;
-
-    /******************* search pagination ********************/
-    var pageState = props.pageState || reactive(_objectSpread2({}, defaultPage));
-    var prevValues;
-
-    var handleSearch = function handleSearch() {
-      emit("list", _objectSpread2(_objectSpread2({}, prevValues), pageState));
-    }; //页数重置1 且搜索
-
-
-    var executeSearchWithResetPage = function executeSearchWithResetPage(values) {
-      prevValues = values;
-      pageState.page = 1;
-      handleSearch();
-    };
+    var slots = _ref.slots;
+    var id = createLoadingId();
+    useEffect(function () {
+      if (!props.loading) {
+        return;
+      }
 
-    return function () {
-      var _slots$divide, _slots$divide2, _slots$footerLeft, _slots$footerRight;
-
-      var searchProps = props.searchProps;
-      var tableProps = props.tableProps;
-      var paginationProps = props.paginationProps; //操作按钮
-
-      var extra = slots.extra ? createVNode("div", {
-        "class": "pro-list-search"
-      }, [slots.extra()]) : null; //分页参数
-
-      var pagination = _objectSpread2(_objectSpread2({}, paginationProps), {}, {
-        currentPage: pageState.page,
-        pageSize: pageState.pageSize,
-        onSizeChange: function onSizeChange(pageSize) {
-          pageState.pageSize = pageSize;
-          handleSearch();
-        },
-        onCurrentChange: function onCurrentChange(current) {
-          pageState.page = current;
-          handleSearch();
-        }
-      });
+      var element = props.target;
 
-      return createVNode(Fragment, null, [createVNode(ProSearchForm, mergeProps(searchProps, {
-        "onFinish": executeSearchWithResetPage
-      }), {
-        "default": function _default() {
-          return [props.extraInSearch && extra];
+      if (!slots["default"]) {
+        //监听
+        if (props.target && isString(props.target)) {
+          element = document.querySelector("#" + props.target);
         }
-      }), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots["default"] ? slots["default"]() : createVNode(ProTable, omit(tableProps, "slots"), tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), createVNode("div", {
-        "class": "pro-list-footer"
-      }, [(_slots$footerLeft = slots.footerLeft) === null || _slots$footerLeft === void 0 ? void 0 : _slots$footerLeft.call(slots), isNumber(paginationProps === null || paginationProps === void 0 ? void 0 : paginationProps.total) && paginationProps.total > 0 && createVNode(Fragment, null, [slots.pagination ? slots.pagination(pagination) : createVNode(ElPagination, pagination, null)]), (_slots$footerRight = slots.footerRight) === null || _slots$footerRight === void 0 ? void 0 : _slots$footerRight.call(slots)])]);
-    };
-  }
-});
-
-function _isSlot$1(s) {
-  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
-}
-
-var proGridProps = function proGridProps() {
-  return {
-    /**
-     * row属性
-     */
-    row: {
-      type: Object,
-      "default": undefined
-    },
-
-    /**
-     * 公共col属性
-     */
-    col: {
-      type: Object
-    },
+      } else {
+        //包裹
+        element = document.getElementById(id);
+      }
 
-    /**
-     *
-     */
-    items: {
-      type: Array
-    }
-  };
-};
+      if (!element) {
+        return;
+      }
 
-var ProGrid = defineComponent({
-  props: _objectSpread2({}, proGridProps()),
-  setup: function setup(props) {
+      var instance = ElLoading.service({
+        target: element,
+        body: props.body,
+        fullscreen: props.fullscreen,
+        lock: props.lock,
+        text: props.text,
+        spinner: props.spinner,
+        background: props.background,
+        customClass: props.customClass
+      });
+      return function () {
+        instance && instance.close();
+      };
+    }, function () {
+      return props.loading;
+    });
     return function () {
-      var _slot;
+      if (!slots["default"]) {
+        return null;
+      }
 
-      return createVNode(ElRow, props.row, _isSlot$1(_slot = map(props.items, function (item) {
-        return createVNode(ElCol, mergeProps({
-          "key": item.rowKey
-        }, merge(props.col, item.col)), {
-          "default": function _default() {
-            return [item.vNode];
-          }
-        });
-      })) ? _slot : {
-        "default": function _default() {
-          return [_slot];
-        }
-      });
+      return createVNode("div", {
+        "id": id
+      }, [slots["default"]()]);
     };
   }
 });
@@ -309,112 +191,52 @@ var ProFormItem = defineComponent({
     };
   }
 });
-//emit;
-var ProForm = defineComponent({
-  inheritAttrs: false,
-  props: _objectSpread2(_objectSpread2(_objectSpread2({}, ElForm.props), omit(ProForm$1.props, "model")), omit(ProGrid.props, "items")),
+var Form = defineComponent({
+  props: _objectSpread2({}, ElForm.props),
   setup: function setup(props, _ref2) {
     var slots = _ref2.slots,
-        expose = _ref2.expose,
         emit = _ref2.emit,
-        attrs = _ref2.attrs;
-    var formRef = ref();
+        expose = _ref2.expose;
     var formState = props.model || reactive({});
-    var showState = props.showState || reactive({});
-
-    var handleRef = function handleRef(el) {
-      var nexEl = _objectSpread2(_objectSpread2({}, el), {}, {
-        submit: function submit() {
-          var _el$validate;
-
-          (_el$validate = el.validate) === null || _el$validate === void 0 ? void 0 : _el$validate.call(el, function (isValid, invalidFields) {
-            if (isValid) {
-              //验证成功
-              //删除不显示的值再触发事件
-              var _showValues = getValidValues(formState, showState, props.showStateRules);
-
-              emit("finish", _showValues, toRaw(formState));
-            } else {
-              emit("finishFailed", invalidFields);
-            }
-          });
-        }
-      });
+    var formRef = ref();
+    var formMethods = ["clearValidate", "resetFields", "scrollToField", "validate", "validateField", "submit"];
+    useEffect(function () {
+      if (!formRef.value) {
+        return;
+      }
 
-      expose(nexEl);
-      formRef.value = nexEl;
-    };
+      formRef.value.submit = function () {
+        var _formRef$value;
 
-    var originKeys = keys(omit(ProForm$1.props, "model"));
+        (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.validate(function (isValid, invalidFields) {
+          if (isValid) {
+            emit("finish", toRaw(formState));
+          } else {
+            emit("finishFailed", invalidFields);
+          }
+        });
+      };
+    }, []);
+    expose(createExpose(formMethods, formRef));
     return function () {
-      var _slots$default;
-
-      return createVNode(ProForm$1, mergeProps(pick.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["provideExtra"])), {
-        "model": formState,
-        "showState": showState,
-        "provideExtra": _objectSpread2({
-          formRef: formRef
-        }, props.provideExtra)
-      }), {
-        "default": function _default() {
-          return [createVNode(ElForm, mergeProps({
-            "ref": handleRef
-          }, attrs, omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["model"])), {
-            "model": formState
-          }), {
-            "default": function _default() {
-              return [props.formElementMap && size(props.columns) > 0 && createVNode(Fragment, null, [props.row ? createVNode(ProGrid, {
-                "row": props.row,
-                "col": props.col,
-                "items": map(props.columns, function (item) {
-                  var vNode = getFormItemEl(props.formElementMap, item, props.needRules);
-                  return {
-                    rowKey: getColumnFormItemName(item),
-                    vNode: vNode,
-                    col: get(item, ["extra", "col"])
-                  };
-                })
-              }, null) : createVNode(Fragment, null, [map(props.columns, function (item) {
-                return getFormItemEl(props.formElementMap, item, props.needRules);
-              })])]), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-            }
-          })];
-        }
-      });
+      return createVNode(ElForm, mergeProps({
+        "ref": formRef
+      }, omit(props, "model"), {
+        "model": formState
+      }), slots);
     };
   }
 });
-
-var ProSearchForm = defineComponent({
-  inheritAttrs: false,
-  props: _objectSpread2(_objectSpread2(_objectSpread2({}, omit(ProForm.props, "inline")), omit(ProSearchForm$1.props, "model", "columns")), {}, {
-    inline: {
-      type: Boolean,
-      "default": true
-    }
-  }),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        attrs = _ref.attrs;
-    var formRef = ref();
-    var formState = props.model || reactive({});
-    var originKeys = keys(omit(ProSearchForm$1.props, "model", "columns"));
-    return function () {
-      return createVNode(Fragment, null, [createVNode(ProForm, mergeProps({
-        "ref": formRef
-      }, attrs, omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), ["needRules", "model"])), {
-        "model": formState,
-        "needRules": false
-      }), slots), createVNode(ProSearchForm$1, mergeProps(pick(props, originKeys), {
-        "model": formState,
-        "columns": props.columns,
-        "onFinish": function onFinish() {
-          var _formRef$value;
-
-          (_formRef$value = formRef.value) === null || _formRef$value === void 0 ? void 0 : _formRef$value.submit();
-        }
-      }), null)]);
-    };
+//emit;
+var ProForm = createForm(Form, ProGrid);
+var ProSearchForm = createSearchForm(ProForm, {
+  needRules: {
+    type: Boolean,
+    "default": false
+  },
+  inline: {
+    type: Boolean,
+    "default": true
   }
 });
 
@@ -445,7 +267,7 @@ var ProSelect = defineComponent({
 
       return createVNode(ElSelect, mergeProps(omit(props, invalidKeys), {
         "onUpdate:modelValue": function onUpdateModelValue(v) {
-          emit("update:modelValue", v);
+          emit("update:modelValue", v ? v : undefined);
         }
       }), _objectSpread2({
         "default": function _default() {
@@ -455,7 +277,66 @@ var ProSelect = defineComponent({
             }, item), null);
           }), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
         }
-      }, omit(props, "slots")));
+      }, omit(slots, "default")));
+    };
+  }
+});
+
+function _isSlot(s) {
+  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
+}
+
+var proRadioProps = function proRadioProps() {
+  return {
+    options: {
+      type: Array
+    },
+    buttonStyle: {
+      type: String,
+      "default": "default"
+    }
+  };
+};
+
+var ProRadio = defineComponent({
+  props: _objectSpread2(_objectSpread2({}, ElRadioGroup.props), proRadioProps()),
+  setup: function setup(props, _ref) {
+    var emit = _ref.emit;
+    var invalidKeys = keys(proRadioProps());
+    return function () {
+      var _slot;
+
+      return createVNode(ElRadioGroup, mergeProps(omit(props, invalidKeys), {
+        "onUpdate:modelValue": function onUpdateModelValue(v) {
+          emit("update:modelValue", v);
+        }
+      }), _isSlot(_slot = map(props.options, function (item) {
+        if (props.buttonStyle === "button") {
+          return createVNode(ElRadioButton, mergeProps({
+            "key": item.value
+          }, item, {
+            "label": item.value
+          }), {
+            "default": function _default() {
+              return [item.label];
+            }
+          });
+        }
+
+        return createVNode(ElRadio, mergeProps({
+          "key": item.value
+        }, item, {
+          "label": item.value
+        }), {
+          "default": function _default() {
+            return [item.label];
+          }
+        });
+      })) ? _slot : {
+        "default": function _default() {
+          return [_slot];
+        }
+      });
     };
   }
 });
@@ -496,7 +377,7 @@ var ProFormCheckbox = createFormItemComponent({
   name: "PFromCheckbox"
 });
 var ProFormRadio = createFormItemComponent({
-  InputComp: ElRadioGroup,
+  InputComp: ProRadio,
   valueType: "radio",
   name: "PFromRadio"
 });
@@ -534,6 +415,8 @@ var ProSubmitButton = defineComponent({
   }
 });
 
+var FormList = createFormList(ProFormItem);
+
 var proFormListProps = function proFormListProps() {
   return {
     addButtonText: {
@@ -555,215 +438,98 @@ var proFormListProps = function proFormListProps() {
 
 var ProFormList = defineComponent({
   name: "PFormList",
-  props: _objectSpread2(_objectSpread2({}, ProFormItem.props), proFormListProps()),
+  props: _objectSpread2(_objectSpread2({}, FormList.props), proFormListProps()),
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
-    var originKeys = keys(ProFormList$1.props);
     var invalidKeys = keys(proFormListProps());
     return function () {
-      return createVNode(ProFormItem, mergeProps(omit.apply(void 0, [props].concat(_toConsumableArray(originKeys), _toConsumableArray(invalidKeys))), {
-        "name": props.name
-      }), {
-        "default": function _default() {
-          return [createVNode(ProFormList$1, mergeProps(pick(props, originKeys), {
-            "name": props.name
-          }), _objectSpread2({
-            itemMinus: function itemMinus() {
-              return createVNode(ElButton, mergeProps({
-                "link": true
-              }, props.minusButtonProps), {
-                "default": function _default() {
-                  return [props.minusButtonText];
-                }
-              });
-            },
-            add: function add() {
-              return createVNode(ElButton, mergeProps({
-                "type": "primary"
-              }, props.addButtonProps), {
-                "default": function _default() {
-                  return [props.addButtonText];
-                }
-              });
+      return createVNode(FormList, omit(props, invalidKeys), _objectSpread2({
+        itemMinus: function itemMinus() {
+          return createVNode(ElButton, props.minusButtonProps, {
+            "default": function _default() {
+              return [props.minusButtonText];
             }
-          }, slots))];
-        }
-      });
-    };
-  }
-});
-
-/**
- * 添加 和 修改 时候的确定按钮
- */
-
-var OkButton = defineComponent({
-  props: _objectSpread2({}, ElButton.props),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-
-    var _useProCurd = useProCurd(),
-        curdState = _useProCurd.curdState;
-
-    return function () {
-      return createVNode(ProSubmitButton, mergeProps({
-        "onClick": function onClick() {
-          curdState.addAction = CurdAddAction.NORMAL;
-        }
-      }, props, {
-        "loading": curdState.operateLoading
-      }), {
-        "default": function _default() {
-          return [slots["default"] ? slots["default"]() : "确定"];
-        }
-      });
-    };
-  }
-});
-/**
- * 添加 时候的 确定并继续添加按钮
- */
-
-var ContinueAddButton = defineComponent({
-  props: _objectSpread2({}, ElButton.props),
-  setup: function setup(props, _ref2) {
-    var slots = _ref2.slots;
-
-    var _useProCurd2 = useProCurd(),
-        curdState = _useProCurd2.curdState;
-
-    return function () {
-      return createVNode(ProSubmitButton, mergeProps({
-        "onClick": function onClick() {
-          curdState.addAction = CurdAddAction.CONTINUE;
-        }
-      }, props, {
-        "loading": curdState.operateLoading
-      }), {
-        "default": function _default() {
-          return [slots["default"] ? slots["default"]() : "确定并继续"];
+          });
+        },
+        add: function add() {
+          return createVNode(ElButton, props.addButtonProps, {
+            "default": function _default() {
+              return [props.addButtonText];
+            }
+          });
         }
-      });
+      }, slots));
     };
   }
 });
 
-var proOperateButtonProps = function proOperateButtonProps() {
-  return {
-    //显示 确定并继续 按钮
-    showContinueAdd: {
-      type: Boolean,
-      "default": false
-    },
-    //
-    okText: {
-      type: String,
-      "default": "确定"
-    },
-    okButtonProps: {
-      type: Object
+var Table = defineComponent({
+  props: _objectSpread2(_objectSpread2({}, ElTable.props), {}, {
+    columns: {
+      type: Array
     },
-    //
-    continueText: {
-      type: String,
-      "default": "确定并继续"
+    dataSource: {
+      type: Array
     },
-    continueButtonProps: {
-      type: Object
+    loading: {
+      type: Boolean
     }
-  };
-};
-
-var ProOperateButton = defineComponent({
-  props: _objectSpread2({}, proOperateButtonProps()),
-  setup: function setup(props, _ref3) {
-    var slots = _ref3.slots;
-
-    var _useProCurd3 = useProCurd(),
-        curdState = _useProCurd3.curdState;
-
+  }),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
+    var id = createLoadingId("table");
     return function () {
-      var _slots$left, _slots$center, _slots$right;
+      var _slots$start, _slots$default;
 
-      return createVNode("div", {
-        "class": "pro-curd-form-operate"
-      }, [(_slots$left = slots.left) === null || _slots$left === void 0 ? void 0 : _slots$left.call(slots), createVNode(OkButton, props.okButtonProps, {
-        "default": function _default() {
-          return [props.okText];
-        }
-      }), (_slots$center = slots.center) === null || _slots$center === void 0 ? void 0 : _slots$center.call(slots), curdState.mode === CurdCurrentMode.ADD && props.showContinueAdd && createVNode(ContinueAddButton, props.continueButtonProps, {
+      return createVNode(ElTable, mergeProps({
+        "id": id
+      }, omit(props, "columns", "dataSource", "loading"), {
+        "data": props.dataSource || props.data
+      }), _objectSpread2({
         "default": function _default() {
-          return [props.continueText];
+          return [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), map(props.columns, function (item) {
+            return createVNode(ElTableColumn, mergeProps({
+              "key": item.dataIndex
+            }, omit(item, "title", "label", "renderHeader", "prop", "dataIndex", "formatter", "customRender"), {
+              "label": isVNode(item.title) ? undefined : item.title || get(item, "label"),
+              "renderHeader": isVNode(item.title) ? function () {
+                return item.title;
+              } : undefined,
+              "prop": item.dataIndex,
+              "formatter": function formatter(record, column, value, index) {
+                if (item.customRender) {
+                  return item.customRender({
+                    value: value,
+                    text: value,
+                    record: record,
+                    column: column,
+                    index: index
+                  });
+                }
+
+                return value;
+              }
+            }), null);
+          }), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots), props.loading && createVNode(ProLoading, {
+            "target": id,
+            "loading": true
+          }, null)];
         }
-      }), (_slots$right = slots.right) === null || _slots$right === void 0 ? void 0 : _slots$right.call(slots)]);
+      }, omit(slots, "default", "start")));
     };
   }
 });
+var ProTable = createTable(Table);
 
-var proCurdFormProps = function proCurdFormProps() {
+var ProCurdForm = createCurdForm(ProForm, ElButton, function (curdState) {
   return {
-    //
-    operateButtonProps: {
-      type: Object
-    }
+    hideRequiredAsterisk: curdState.mode === CurdCurrentMode.DETAIL
   };
-};
-
-var ProCurdForm = defineComponent({
-  props: _objectSpread2(_objectSpread2({}, ProForm.props), proCurdFormProps()),
-  setup: function setup(props, _ref4) {
-    var slots = _ref4.slots;
-
-    var _useProModule = useProModule(),
-        elementMap = _useProModule.elementMap,
-        formElementMap = _useProModule.formElementMap;
-
-    var _useProCurd4 = useProCurd(),
-        curdState = _useProCurd4.curdState,
-        formColumns = _useProCurd4.formColumns,
-        sendCurdEvent = _useProCurd4.sendCurdEvent;
-
-    var handleFinish = function handleFinish(values) {
-      if (curdState.mode === CurdCurrentMode.EDIT) {
-        //edit
-        sendCurdEvent({
-          action: CurdAction.EDIT,
-          type: CurdSubAction.EXECUTE,
-          values: values
-        });
-      } else {
-        //add
-        sendCurdEvent({
-          action: CurdAction.ADD,
-          type: CurdSubAction.EXECUTE,
-          values: values
-        });
-      }
-    };
-
-    return function () {
-      var _slots$default;
-
-      return createVNode(ProForm, mergeProps(omit(props, "elementMap", "formElementMap"), {
-        "elementMap": props.elementMap || elementMap,
-        "formElementMap": props.formElementMap || formElementMap,
-        "columns": formColumns.value,
-        "model": curdState.detailData,
-        "readonly": curdState.mode === CurdCurrentMode.DETAIL,
-        "hideRequiredAsterisk": curdState.mode === CurdCurrentMode.DETAIL,
-        "onFinish": handleFinish
-      }), _objectSpread2({
-        "default": function _default() {
-          return [curdState.mode !== CurdCurrentMode.DETAIL && createVNode(ProOperateButton, omit(props.operateButtonProps, "slots"), get(props.operateButtonProps, "slots")), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
-        }
-      }, omit(slots, "default")));
-    };
-  }
 });
 var ProCurdFormConnect = defineComponent({
   setup: function setup() {
-    var _useProCurd5 = useProCurd(),
-        formProps = _useProCurd5.formProps;
+    var _useProCurd = useProCurd(),
+        formProps = _useProCurd.formProps;
 
     return function () {
       return createVNode(ProCurdForm, omit(formProps === null || formProps === void 0 ? void 0 : formProps.value, "slots"), get(formProps === null || formProps === void 0 ? void 0 : formProps.value, "slots"));
@@ -771,113 +537,45 @@ var ProCurdFormConnect = defineComponent({
   }
 });
 
-/**
- * 组合列表
- * SearchForm + Table + Pagination
+var CurdList = createCurdList(ProSearchForm, ProTable);
+
+/**
+ * 组合列表
+ * SearchForm + Table + Pagination
  */
 var ProCurdList = defineComponent({
-  props: _objectSpread2({}, ProList.props),
+  props: _objectSpread2(_objectSpread2({}, CurdList.props), {}, {
+    paginationProps: {
+      type: Object
+    }
+  }),
   setup: function setup(props, _ref) {
     var slots = _ref.slots;
-
-    var _useProModule = useProModule(),
-        elementMap = _useProModule.elementMap,
-        formElementMap = _useProModule.formElementMap;
-
-    var _useProCurd = useProCurd(),
-        curdState = _useProCurd.curdState,
-        searchColumns = _useProCurd.searchColumns,
-        tableColumns = _useProCurd.tableColumns,
-        getOperate = _useProCurd.getOperate,
-        sendCurdEvent = _useProCurd.sendCurdEvent;
-    /******************* table ********************/
-
-
-    var prepareTableItem = function prepareTableItem(action) {
-      var item = getOperate(action);
-      return _objectSpread2(_objectSpread2({}, pick(item, "label", "element", "disabled", "sort")), {}, {
-        show: !isUndefined(item === null || item === void 0 ? void 0 : item.show) ? item === null || item === void 0 ? void 0 : item.show : false,
-        onClick: function onClick(record) {
-          if (item !== null && item !== void 0 && item.onClick) {
-            item.onClick(record);
-            return;
-          }
-
-          sendCurdEvent({
-            action: action,
-            type: CurdSubAction.EMIT,
-            record: record
-          });
-        },
-        value: action
-      });
-    }; //table操作栏 items
-
-
-    var tableOperateItems = [prepareTableItem(CurdAction.DETAIL), prepareTableItem(CurdAction.EDIT), prepareTableItem(CurdAction.DELETE)];
     return function () {
-      var _curdState$listData, _curdState$listData2;
-
-      var tableProps = props.tableProps;
-      return createVNode(ProList, mergeProps({
-        "onList": function onList(values) {
-          sendCurdEvent({
-            action: CurdAction.LIST,
-            type: CurdSubAction.EMIT,
-            values: values
-          });
-        }
-      }, props, {
-        "searchProps": _objectSpread2(_objectSpread2({
-          formElementMap: formElementMap
-        }, props.searchProps), {}, {
-          columns: searchColumns.value
-        }),
-        "tableProps": _objectSpread2(_objectSpread2({
-          elementMap: elementMap
-        }, tableProps), {}, {
-          operate: mergeWith({
-            items: tableOperateItems
-          }, tableProps === null || tableProps === void 0 ? void 0 : tableProps.operate, function (objValue, srcValue) {
-            if (isArray(objValue)) {
-              if (isArray(srcValue)) {
-                //合并
-                return concat(objValue, map(srcValue, function (item) {
-                  var nextItem = _objectSpread2({}, item);
-
-                  if (!item.onClick) {
-                    nextItem.onClick = function (record) {
-                      sendCurdEvent({
-                        action: CurdAction.LIST,
-                        type: "operate-".concat(item.value),
-                        record: record
-                      });
-                    };
-                  }
-
-                  return nextItem;
-                }));
-              } else {
-                //使用curd默认
-                return objValue;
-              }
+      return createVNode(CurdList, omit(props, "paginationProps"), _objectSpread2({
+        pagination: function pagination(pageState, total, handleSearch) {
+          return createVNode(ElPagination, mergeProps(props.paginationProps, {
+            "total": total,
+            "currentPage": pageState.page,
+            "pageSize": pageState.pageSize,
+            "onSizeChange": function onSizeChange(pageSize) {
+              pageState.pageSize = pageSize;
+              handleSearch();
+            },
+            "onCurrentChange": function onCurrentChange(current) {
+              pageState.page = current;
+              handleSearch();
             }
-          }),
-          columns: tableColumns.value,
-          loading: curdState.listLoading,
-          data: (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
-        }),
-        "paginationProps": _objectSpread2(_objectSpread2({}, props.paginationProps), {}, {
-          total: (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total
-        })
-      }), slots);
+          }), null);
+        }
+      }, slots));
     };
   }
 });
 var ProCurdListConnect = defineComponent({
   setup: function setup() {
-    var _useProCurd2 = useProCurd(),
-        listProps = _useProCurd2.listProps;
+    var _useProCurd = useProCurd(),
+        listProps = _useProCurd.listProps;
 
     return function () {
       return createVNode(ProCurdList, omit(listProps === null || listProps === void 0 ? void 0 : listProps.value, "slots"), get(listProps === null || listProps === void 0 ? void 0 : listProps.value, "slots"));
@@ -885,53 +583,14 @@ var ProCurdListConnect = defineComponent({
   }
 });
 
-function _isSlot(s) {
-  return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !isVNode(s);
-}
-
-var ProCurdDesc = defineComponent({
-  props: _objectSpread2({}, ElDescriptions.props),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-
-    var _useProModule = useProModule(),
-        getItemVNode = _useProModule.getItemVNode;
-
-    var _useProCurd = useProCurd(),
-        curdState = _useProCurd.curdState,
-        descColumns = _useProCurd.descColumns;
-
-    var descVNodes = computed(function () {
-      return map(descColumns.value, function (item) {
-        var _slot;
-
-        var value = get(curdState.detailData, item.dataIndex);
-        return createVNode(ElDescriptionsItem, mergeProps({
-          "key": item.dataIndex,
-          "label": item.title
-        }, get(item.extra, "desc")), _isSlot(_slot = getItemVNode(item, value)) ? _slot : {
-          "default": function _default() {
-            return [_slot];
-          }
-        });
-      });
-    });
-    return function () {
-      return createVNode(ElDescriptions, props, _objectSpread2({
-        "default": function _default() {
-          return descVNodes.value;
-        }
-      }, omit(slots, "default")));
-    };
-  }
-});
+var ProCurdDesc = createCurdDesc(ElDescriptions, ElDescriptionsItem);
 var ProCurdDescConnect = defineComponent({
   setup: function setup() {
-    var _useProCurd2 = useProCurd(),
-        descProps = _useProCurd2.descProps;
+    var _useProCurd = useProCurd(),
+        descProps = _useProCurd.descProps;
 
     return function () {
-      return createVNode(ProCurdList, omit(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"), get(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"));
+      return createVNode(ProCurdDesc, omit(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"), get(descProps === null || descProps === void 0 ? void 0 : descProps.value, "slots"));
     };
   }
 });
@@ -993,4 +652,4 @@ var ProCurdModalConnect = defineComponent({
   }
 });
 
-export { ContinueAddButton, OkButton, ProCurdDesc, ProCurdDescConnect, ProCurdForm, ProCurdFormConnect, ProCurdList, ProCurdListConnect, ProCurdModal, ProCurdModalConnect, ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormItem, ProFormList, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextNumber, ProFormTimePicker, ProFormTreeSelect, ProGrid, ProList, ProOperateButton, ProSearchForm, ProSelect, ProSubmitButton, ProTable, createFormItemComponent, defaultPage };
+export { ProCurdDesc, ProCurdDescConnect, ProCurdForm, ProCurdFormConnect, ProCurdList, ProCurdListConnect, ProCurdModal, ProCurdModalConnect, ProForm, ProFormCascader, ProFormCheckbox, ProFormDatePicker, ProFormItem, ProFormList, ProFormRadio, ProFormSelect, ProFormSwitch, ProFormText, ProFormTextNumber, ProFormTimePicker, ProFormTreeSelect, ProGrid, ProLoading, ProRadio, ProSearchForm, ProSelect, ProSubmitButton, ProTable, createFormItemComponent, createLoadingId };