@vue-start/pro 0.3.2 → 0.4.2

package/dist/index.es.js

@@ -1,5 +1,5 @@
-import { defineComponent, createVNode, mergeProps, isVNode, computed, reactive, inject, h, provide, ref, Fragment } from 'vue';
-import { map, isString, forEach, findIndex, get, isFunction, size, find, filter as filter$1, keys, omit, isArray, split, isEmpty, isObject, mergeWith, reduce, sortBy, pick, concat, isUndefined, debounce, some, clone, set, isBoolean } from 'lodash';
+import { defineComponent, createVNode, mergeProps, isVNode, computed, h, inject, reactive, Fragment, provide, ref } from 'vue';
+import { map, isString, forEach, reduce, size, get, set, pick, omit, isArray, some, keys, isFunction, head, isObject, findIndex, find, filter as filter$1, split, isEmpty, mergeWith, sortBy, concat, isUndefined, debounce, clone, isBoolean } from 'lodash';
 import { filter, tap, merge, Subject } from 'rxjs';
 import { useEffect, setReactiveValue, useWatch } from '@vue-start/hooks';
 import { useRequestProvide, isFailedRequestActor, isPreRequestActor, isDoneRequestActor } from '@vue-start/request';
@@ -195,186 +195,12 @@ var useComposeRequestActor = function useComposeRequestActor(actors, options, ca
   }, []);
 };
 
-var treeDefaultNames = {
-  children: "children",
-  label: "label",
-  value: "value"
-};
-/**
- * 根据value从treeData中找到对象
- * @param data
- * @param value
- * @param fieldNames
- * @param cb 对象：同步   方法：回调，可以理解为异步
- */
-
-var findTargetInTree = function findTargetInTree(data, value, fieldNames, cb) {
-  var index = findIndex(data, function (item) {
-    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
-  });
-
-  if (index > -1) {
-    if (isFunction(cb)) {
-      cb(index, data[index], data);
-    } else {
-      cb.index = index;
-      cb.target = data[index];
-      cb.list = data;
-    }
-
-    return;
-  }
-
-  forEach(data, function (item) {
-    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
-
-    if (size(children) > 0) {
-      findTargetInTree(children, value, fieldNames, cb);
-    }
-  });
-};
-/**
- * 根据value从treeData中找出对象及父列表
- * @param data
- * @param value
- * @param fieldNames
- * @param cb
- * @param parent
- */
-
-var findTargetListInTree = function findTargetListInTree(data, value, fieldNames, cb) {
-  var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
-  var target = find(data, function (item) {
-    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
-  });
-
-  if (target) {
-    if (isFunction(cb)) {
-      cb([].concat(_toConsumableArray(parent), [target]));
-    } else {
-      cb.list = [].concat(_toConsumableArray(parent), [target]);
-    }
-
-    return;
-  }
-
-  forEach(data, function (item) {
-    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
-
-    if (size(children) > 0) {
-      findTargetListInTree(children, value, fieldNames, cb, [].concat(_toConsumableArray(parent), [item]));
-    }
-  });
-};
-
-/**
- * 剔除showState或showStateRules规则为!true的值
- * @param values
- * @param showState
- * @param showStateRules
- */
-
-var getValidValues = function getValidValues(values, showState, showStateRules) {
-  if (showState) {
-    var invalidKeys = filter$1(keys(showState), function (key) {
-      return !showState[key];
-    });
-    return omit(values, invalidKeys);
-  }
-
-  if (showStateRules) {
-    var _invalidKeys = filter$1(keys(showStateRules), function (key) {
-      return !showStateRules[key](values);
-    });
-
-    return omit(values, _invalidKeys);
-  }
-
-  return values;
-};
-/**
- * string类型的path转为arr
- * @param path
- */
-
-var convertPathToList = function convertPathToList(path) {
-  if (!path) {
-    return undefined;
-  }
-
-  if (isArray(path)) {
-    return path;
-  }
-
-  if (path && isString(path) && path.indexOf(".") > 0) {
-    return split(path, ".");
-  }
-
-  return [path];
-};
-/**
- * 将listState 中的数据通过id merge到 list item中
- * ps：数组会替换
- * 注意：mergeWith 会改变原始对象
- * @param list
- * @param listState
- * @param id
- */
-
-var mergeStateToList = function mergeStateToList(list, listState, id) {
-  if (!listState || !id) {
-    return list;
-  }
-
-  return map(list, function (item) {
-    var idName = isFunction(id) ? id(item) : id; //如果listState中有值，merge处理
-
-    var stateData = get(listState, idName);
-
-    if (!stateData || isEmpty(stateData) || isFunction(stateData) || !isObject(stateData)) {
-      return item;
-    } //只有是对象（键值对）才合并
-
-
-    return mergeWith(item, stateData, function (objValue, srcValue) {
-      //如果是数组，替换
-      if (isArray(objValue) || isArray(srcValue)) {
-        return srcValue;
-      }
-    });
-  });
-};
-
-/**
- * 唯一id
- */
-
-var generateId = function generateId() {
-  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-};
-/**
- * ref 传递
- */
-
-var createExpose = function createExpose(methods, targetRef) {
-  return reduce(methods, function (pair, method) {
-    return _objectSpread2(_objectSpread2({}, pair), {}, _defineProperty({}, method, function () {
-      var _targetRef$value, _targetRef$value$meth;
-
-      for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-        params[_key] = arguments[_key];
-      }
-
-      return (_targetRef$value = targetRef.value) === null || _targetRef$value === void 0 ? void 0 : (_targetRef$value$meth = _targetRef$value[method]) === null || _targetRef$value$meth === void 0 ? void 0 : _targetRef$value$meth.call.apply(_targetRef$value$meth, [_targetRef$value].concat(params));
-    }));
-  }, {});
-};
+/***************************************** curd模式 *****************************************/
 
 /**
  * 获取Column的valueType，默认"text"
  * @param column
  */
-
 var getColumnValueType = function getColumnValueType(column) {
   return column.formValueType || column.valueType || "text";
 };
@@ -440,6 +266,213 @@ var getItemEl = function getItemEl(elementMap, column, value) {
     value: value
   }), (_column$formFieldProp2 = column.formFieldProps) === null || _column$formFieldProp2 === void 0 ? void 0 : _column$formFieldProp2.slots);
 };
+/***************************************** 通用模式 *****************************************/
+
+var renderElements = function renderElements(elementMap, elementConfigs) {
+  return map(elementConfigs, function (elementConfig) {
+    return renderElement(elementMap, elementConfig);
+  });
+};
+/**
+ * props转换
+ */
+
+var convertPropsEl = function convertPropsEl(elementMap, elementConfig) {
+  var _elementConfig$highCo;
+
+  var elementProps = elementConfig.elementProps;
+
+  var nextProps = _objectSpread2({}, elementConfig.elementProps);
+
+  forEach((_elementConfig$highCo = elementConfig.highConfig$) === null || _elementConfig$highCo === void 0 ? void 0 : _elementConfig$highCo.registerPropsTrans, function (item) {
+    var target = get(elementProps, item.name);
+
+    if (!target || isVNode(target)) {
+      return;
+    }
+
+    if (isArray(target)) {
+      //如果list中存在VNode，不转换
+      if (some(target, function (sub) {
+        return isVNode(sub);
+      })) {
+        return;
+      } //如果碰到特殊场景，可以替换成单个渲染模式
+
+
+      set(nextProps, item.name, renderElements(elementMap, target));
+      return;
+    }
+
+    if (!target.elementType) {
+      return;
+    }
+
+    if (item.isFun) {
+      set(nextProps, item.name, function () {
+        for (var _len = arguments.length, params$ = new Array(_len), _key = 0; _key < _len; _key++) {
+          params$[_key] = arguments[_key];
+        }
+
+        var ep = item.needParams ? _objectSpread2(_objectSpread2({}, target.elementProps), {}, {
+          params$: params$
+        }) : target.elementProps;
+        return renderElement(elementMap, _objectSpread2(_objectSpread2({}, target), {}, {
+          elementProps: ep
+        }));
+      });
+    } else {
+      set(nextProps, item.name, renderElement(elementMap, target));
+    }
+  });
+  return nextProps;
+};
+/**
+ * slots转换
+ */
+
+
+var convertSlots = function convertSlots(elementMap, elementConfig) {
+  var children = size(elementConfig.children) > 0 ? renderElements(elementMap, elementConfig.children) : undefined; //children插槽名称
+
+  var childrenSlotName = elementConfig.childrenSlotName || "default";
+  var validSlots = omit(elementConfig.slots, children ? childrenSlotName : ""); //如果slots注册的是 IElementConfig ，进行转换
+
+  forEach(keys(validSlots), function (k) {
+    var v = validSlots[k]; //IElementConfig
+
+    if (v && !isFunction(v) && v.elementType) {
+      validSlots[k] = function () {
+        for (var _len2 = arguments.length, params$ = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+          params$[_key2] = arguments[_key2];
+        }
+
+        //如果需要params，在props中注入 params$
+        var elementProps = v.needParams ? _objectSpread2(_objectSpread2({}, v.elementProps), {}, {
+          params$: params$
+        }) : v.elementProps;
+        return renderElement(elementMap, _objectSpread2(_objectSpread2({}, v), {}, {
+          elementProps: elementProps
+        }));
+      };
+    }
+  });
+  return _objectSpread2(_defineProperty({}, childrenSlotName, children ? function () {
+    return children;
+  } : undefined), validSlots);
+};
+/**
+ *
+ * @param elementMap
+ * @param elementConfig
+ */
+
+
+var renderElement = function renderElement(elementMap, elementConfig) {
+  var El = get(elementMap, elementConfig.elementType) || elementConfig.elementType; //如果有highConfig$，包裹一层Wrapper
+
+  if (elementConfig.highConfig$) {
+    return h(Wrapper, {
+      key: elementConfig.elementId,
+      elementMap: elementMap,
+      elementConfig: elementConfig
+    });
+  }
+
+  var slots = convertSlots(elementMap, elementConfig);
+  var elementProps = convertPropsEl(elementMap, elementConfig);
+  return h(El, _objectSpread2({
+    key: elementConfig.elementId
+  }, elementProps), slots);
+};
+/**
+ * 获取第一层级属性名
+ * 如：['aaa','bbb',...] 中的 'aaa'
+ * 如："aaa.bbb.ccc..." 中的 'aaa'
+ */
+
+var getFirstPropName = function getFirstPropName(name) {
+  if (isArray(name)) {
+    return head(name);
+  } else if (isString(name) && name.indexOf(".") > 0) {
+    return name.substring(0, name.indexOf("."));
+  }
+
+  return name;
+};
+/**
+ * 处理highConfig$
+ */
+
+var Wrapper = defineComponent({
+  props: {
+    elementMap: {
+      type: Object
+    },
+    elementConfig: {
+      type: Object
+    }
+  },
+  setup: function setup(props) {
+    var _useProModule = useProModule(),
+        state = _useProModule.state,
+        sendEvent = _useProModule.sendEvent;
+
+    var elementMap = props.elementMap,
+        elementConfig = props.elementConfig;
+    var highConfig$ = elementConfig.highConfig$; //转换props
+
+    var elementProps = convertPropsEl(elementMap, elementConfig); //事件订阅
+
+    var events = reduce(highConfig$.registerEventList, function (pair, item) {
+      return _objectSpread2(_objectSpread2({}, pair), {}, _defineProperty({}, item.name, function () {
+        for (var _len3 = arguments.length, params = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+          params[_key3] = arguments[_key3];
+        }
+
+        sendEvent({
+          type: item.sendEventName || elementConfig.elementId,
+          payload: params
+        });
+      }));
+    }, {}); //receiveStateList 订阅
+
+    var receiveStates = computed(function () {
+      if (!highConfig$.registerStateList || size(highConfig$.registerStateList) <= 0) {
+        return undefined;
+      }
+
+      var changeProps = _objectSpread2({}, elementProps); //赋值 && 返回一级属性名称
+
+
+      var firstPropNameList = map(highConfig$.registerStateList, function (item) {
+        var targetName = item.mapName || item.name; //从state中取值
+
+        var value = get(state, item.name); //赋值
+
+        set(changeProps, targetName, value); //返回一级属性名称
+
+        return getFirstPropName(targetName);
+      });
+      return pick(changeProps, firstPropNameList);
+    });
+    var El = get(elementMap, elementConfig.elementType) || elementConfig.elementType;
+    var slots = convertSlots(elementMap, elementConfig);
+    return function () {
+      //如果标记show$值为false，不渲染组件
+      var show$ = get(receiveStates.value, "show$");
+
+      if (show$ === false) {
+        return null;
+      }
+
+      return h(El, _objectSpread2(_objectSpread2(_objectSpread2({
+        key: elementConfig.elementId
+      }, elementProps), omit(receiveStates.value, "show$")), events), slots);
+    };
+  }
+});
+
 var ProModuleKey = Symbol("pro-module");
 var useProModule = function useProModule() {
   return inject(ProModuleKey);
@@ -462,32 +495,17 @@ var proModuleProps = function proModuleProps() {
     },
 
     /**
-     * 配置（静态）
-     */
-    columns: {
-      type: Array
-    },
-
-    /**
-     * 配置（动态）
-     * columns动态属性兼容
-     */
-    columnState: {
-      type: Object
-    },
-
-    /**
-     * 展示组件集
+     * 组件集
      */
     elementMap: {
       type: Object
     },
 
     /**
-     * 录入组件集
+     * 组件描述（树）
      */
-    formElementMap: {
-      type: Object
+    elementConfigs: {
+      type: Array
     },
 
     /**
@@ -496,34 +514,22 @@ var proModuleProps = function proModuleProps() {
     requests: {
       type: Array
     }
-  };
-};
-
-var ProModule = defineComponent({
-  props: _objectSpread2({}, proModuleProps()),
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-        expose = _ref.expose;
-
-    /**
-     * columns columnState 合并
-     */
-    var columns = computed(function () {
-      return mergeStateToList(props.columns, props.columnState, function (item) {
-        return getColumnFormItemName(item);
-      });
-    });
-    /*********************************** 渲染组件 ***************************************/
-    // 获取FormItem VNode
-
-    var getFormItemVNode = function getFormItemVNode(column) {
-      var needRules = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      return getFormItemEl(props.formElementMap, column, needRules);
-    }; // 获取Item VNode
+  };
+};
 
+var ProModule = defineComponent({
+  props: _objectSpread2({}, proModuleProps()),
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots,
+        expose = _ref.expose;
 
-    var getItemVNode = function getItemVNode(column, value) {
-      return getItemEl(props.elementMap, column, value);
+    /*********************************** render ***************************************/
+    var render = function render(elementConfig) {
+      if (isArray(elementConfig)) {
+        return renderElements(props.elementMap, elementConfig);
+      }
+
+      return renderElement(props.elementMap, elementConfig);
     };
     /*********************************** 事件处理 ***************************************/
 
@@ -539,13 +545,15 @@ var ProModule = defineComponent({
     var state = props.state || reactive({});
 
     var dispatch = function dispatch(action) {
-      //如果要更新的属性值是 object ，执行覆盖操作
-      if (isObject(state[action.type])) {
-        setReactiveValue(state[action.type], action.payload);
+      var prev = state[action.type];
+      var data = isFunction(action.payload) ? action.payload(prev) : action.payload; //如果要更新的属性值是 object ，执行覆盖操作
+
+      if (isObject(prev)) {
+        setReactiveValue(state[action.type], data);
         return;
       }
 
-      state[action.type] = action.payload;
+      state[action.type] = data;
     };
     /*********************************** request ***************************************/
 
@@ -649,11 +657,7 @@ var ProModule = defineComponent({
       }
     }, true);
     provideProModule({
-      columns: columns,
-      getFormItemVNode: getFormItemVNode,
-      getItemVNode: getItemVNode,
       elementMap: props.elementMap,
-      formElementMap: props.formElementMap,
       //
       subject$: subject$,
       sendEvent: sendEvent,
@@ -671,7 +675,7 @@ var ProModule = defineComponent({
     return function () {
       var _slots$default;
 
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
+      return createVNode(Fragment, null, [size(props.elementConfigs) > 0 && render(props.elementConfigs), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
     };
   }
 });
@@ -750,6 +754,181 @@ var CurdAddAction;
   CurdAddAction["CONTINUE"] = "CONTINUE";
 })(CurdAddAction || (CurdAddAction = {}));
 
+var treeDefaultNames = {
+  children: "children",
+  label: "label",
+  value: "value"
+};
+/**
+ * 根据value从treeData中找到对象
+ * @param data
+ * @param value
+ * @param fieldNames
+ * @param cb 对象：同步   方法：回调，可以理解为异步
+ */
+
+var findTargetInTree = function findTargetInTree(data, value, fieldNames, cb) {
+  var index = findIndex(data, function (item) {
+    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
+  });
+
+  if (index > -1) {
+    if (isFunction(cb)) {
+      cb(index, data[index], data);
+    } else {
+      cb.index = index;
+      cb.target = data[index];
+      cb.list = data;
+    }
+
+    return;
+  }
+
+  forEach(data, function (item) {
+    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
+
+    if (size(children) > 0) {
+      findTargetInTree(children, value, fieldNames, cb);
+    }
+  });
+};
+/**
+ * 根据value从treeData中找出对象及父列表
+ * @param data
+ * @param value
+ * @param fieldNames
+ * @param cb
+ * @param parent
+ */
+
+var findTargetListInTree = function findTargetListInTree(data, value, fieldNames, cb) {
+  var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  var target = find(data, function (item) {
+    return get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
+  });
+
+  if (target) {
+    if (isFunction(cb)) {
+      cb([].concat(_toConsumableArray(parent), [target]));
+    } else {
+      cb.list = [].concat(_toConsumableArray(parent), [target]);
+    }
+
+    return;
+  }
+
+  forEach(data, function (item) {
+    var children = get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
+
+    if (size(children) > 0) {
+      findTargetListInTree(children, value, fieldNames, cb, [].concat(_toConsumableArray(parent), [item]));
+    }
+  });
+};
+
+/**
+ * 剔除showState或showStateRules规则为!true的值
+ * @param values
+ * @param showState
+ * @param showStateRules
+ */
+
+var getValidValues = function getValidValues(values, showState, showStateRules) {
+  if (showState) {
+    var invalidKeys = filter$1(keys(showState), function (key) {
+      return !showState[key];
+    });
+    return omit(values, invalidKeys);
+  }
+
+  if (showStateRules) {
+    var _invalidKeys = filter$1(keys(showStateRules), function (key) {
+      return !showStateRules[key](values);
+    });
+
+    return omit(values, _invalidKeys);
+  }
+
+  return values;
+};
+/**
+ * string类型的path转为arr
+ * @param path
+ */
+
+var convertPathToList = function convertPathToList(path) {
+  if (!path) {
+    return undefined;
+  }
+
+  if (isArray(path)) {
+    return path;
+  }
+
+  if (path && isString(path) && path.indexOf(".") > 0) {
+    return split(path, ".");
+  }
+
+  return [path];
+};
+/**
+ * 将listState 中的数据通过id merge到 list item中
+ * ps：数组会替换
+ * 注意：mergeWith 会改变原始对象
+ * @param list
+ * @param listState
+ * @param id
+ */
+
+var mergeStateToList = function mergeStateToList(list, listState, id) {
+  if (!listState || !id) {
+    return list;
+  }
+
+  return map(list, function (item) {
+    var idName = isFunction(id) ? id(item) : id; //如果listState中有值，merge处理
+
+    var stateData = get(listState, idName);
+
+    if (!stateData || isEmpty(stateData) || isFunction(stateData) || !isObject(stateData)) {
+      return item;
+    } //只有是对象（键值对）才合并
+
+
+    return mergeWith(item, stateData, function (objValue, srcValue) {
+      //如果是数组，替换
+      if (isArray(objValue) || isArray(srcValue)) {
+        return srcValue;
+      }
+    });
+  });
+};
+
+/**
+ * 唯一id
+ */
+
+var generateId = function generateId() {
+  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+};
+/**
+ * ref 传递
+ */
+
+var createExpose = function createExpose(methods, targetRef) {
+  return reduce(methods, function (pair, method) {
+    return _objectSpread2(_objectSpread2({}, pair), {}, _defineProperty({}, method, function () {
+      var _targetRef$value, _targetRef$value$meth;
+
+      for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
+        params[_key] = arguments[_key];
+      }
+
+      return (_targetRef$value = targetRef.value) === null || _targetRef$value === void 0 ? void 0 : (_targetRef$value$meth = _targetRef$value[method]) === null || _targetRef$value$meth === void 0 ? void 0 : _targetRef$value$meth.call.apply(_targetRef$value$meth, [_targetRef$value].concat(params));
+    }));
+  }, {});
+};
+
 var defaultPage = {
   page: 1,
   pageSize: 10
@@ -757,16 +936,38 @@ var defaultPage = {
 
 var proCurdProps = function proCurdProps() {
   return {
-    /**
-     * 列表 或 详情 的唯一标识
+    /**
+     * 配置（静态）
+     */
+    columns: {
+      type: Array
+    },
+
+    /**
+     * 配置（动态）
+     * columns动态属性兼容
+     */
+    columnState: {
+      type: Object
+    },
+
+    /**
+     * 录入组件集
+     */
+    formElementMap: {
+      type: Object
+    },
+
+    /**
+     * 列表 或 详情 的唯一标识
      */
     rowKey: {
       type: String,
       "default": "id"
     },
 
-    /**
-     * operates
+    /**
+     * operates
      */
     operates: {
       type: Array
@@ -795,58 +996,67 @@ var Curd = defineComponent({
         expose = _ref.expose;
 
     var _ref2 = useProModule(),
-        columns = _ref2.columns,
+        elementMap = _ref2.elementMap,
         state = _ref2.state,
         sendEvent = _ref2.sendEvent,
         sendRequest = _ref2.sendRequest;
-    /**
-     * 排序
-     * @param list
-     * @param propName
+    /**
+     * columns columnState 合并
      */
 
 
-    var dealSort = function dealSort(list, propName) {
-      return sortBy(list, function (item) {
-        return get(item, propName);
+    var columns = computed(function () {
+      return mergeStateToList(props.columns, props.columnState, function (item) {
+        return getColumnFormItemName(item);
       });
+    });
+    /*********************************** 渲染组件 ***************************************/
+    // 获取FormItem VNode
+
+    var getFormItemVNode = function getFormItemVNode(column) {
+      var needRules = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      return getFormItemEl(props.formElementMap, column, needRules);
+    }; // 获取Item VNode
+
+
+    var getItemVNode = function getItemVNode(column, value) {
+      return getItemEl(elementMap, column, value);
     };
-    /**
-     * 非 hideInForm columns
+    /**
+     * ${signName} 配置为true 会被选择
+     * @param signName
+     * @param opposite 如果为true，未配置（undefined）会被选择
      */
 
 
+    var getSignColumns = function getSignColumns(signName, opposite) {
+      var signColumns = filter$1(columns.value, function (item) {
+        var sign = get(item, ["extra", signName]) || get(item, signName);
+
+        if (opposite) {
+          //不为false 即为选中
+          return sign !== false;
+        } //只有true 才为选中
+
+
+        return sign;
+      });
+      return sortBy(signColumns, function (item) {
+        return get(item, ["extra", "".concat(signName, "Sort")]) || get(item, "".concat(signName, "Sort"));
+      });
+    };
+
     var formColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInForm;
-      }), "formSort");
+      return getSignColumns("form", true);
     });
-    /**
-     * 非 hideInDetail columns
-     */
-
     var descColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInDetail;
-      }), "descSort");
+      return getSignColumns("detail", true);
     });
-    /**
-     *  非 hideInTable columns
-     */
-
     var tableColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !item.hideInTable;
-      }), "tableSort");
+      return getSignColumns("table", true);
     });
-    /**
-     * search columns
-     */
-
     var searchColumns = computed(function () {
-      return dealSort(filter$1(columns.value, function (item) {
-        return !!item.search;
-      }), "searchSort");
+      return getSignColumns("search");
     });
     /******************************** 逻辑 *************************************/
     //上一次发起列表请求的参数
@@ -931,6 +1141,13 @@ var Curd = defineComponent({
       return props.modalProps;
     });
     provideProCurd({
+      columns: columns,
+      getSignColumns: getSignColumns,
+      getFormItemVNode: getFormItemVNode,
+      getItemVNode: getItemVNode,
+      elementMap: elementMap,
+      formElementMap: props.formElementMap,
+      //
       rowKey: props.rowKey,
       curdState: state,
       formColumns: formColumns,
@@ -1412,21 +1629,38 @@ function _isSlot(s) {
 
 var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
   return defineComponent({
-    props: _objectSpread2({}, Descriptions.props),
+    props: _objectSpread2(_objectSpread2({}, Descriptions.props), {}, {
+      //重写Item content
+      renderItem: {
+        type: Function
+      },
+      //标记名称
+      signName: {
+        type: String
+      }
+    }),
     setup: function setup(props, _ref) {
       var slots = _ref.slots;
 
-      var _useProModule = useProModule(),
-          getItemVNode = _useProModule.getItemVNode;
-
       var _useProCurd = useProCurd(),
+          getItemVNode = _useProCurd.getItemVNode,
           curdState = _useProCurd.curdState,
-          descColumns = _useProCurd.descColumns;
+          descColumns = _useProCurd.descColumns,
+          getSignColumns = _useProCurd.getSignColumns;
 
       var descVNodes = computed(function () {
-        return map(descColumns.value, function (item) {
+        var columns = props.signName ? getSignColumns(props.signName) : descColumns.value;
+        return map(columns, function (item) {
           var _slot;
 
+          var _props$renderItem;
+
+          var vn = (_props$renderItem = props.renderItem) === null || _props$renderItem === void 0 ? void 0 : _props$renderItem.call(props, item);
+
+          if (vn) {
+            return vn;
+          }
+
           var value = get(curdState.detailData, item.dataIndex);
           return createVNode(DescriptionsItem, mergeProps({
             "key": item.dataIndex,
@@ -1443,7 +1677,7 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
         return createVNode(Descriptions, props, _objectSpread2({
           "default": function _default() {
-            return [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), descVNodes, (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
+            return [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), descVNodes.value, (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)];
           }
         }, omit(slots, "default", "start")));
       };
@@ -1453,6 +1687,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
 var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   return {
+    //标记名称
+    signName: {
+      type: String
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1484,22 +1722,36 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
 
 var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
   return defineComponent({
+    inheritAttrs: false,
     props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
-
-      var _useProModule = useProModule(),
-          elementMap = _useProModule.elementMap,
-          formElementMap = _useProModule.formElementMap;
+      var slots = _ref.slots,
+          attrs = _ref.attrs,
+          expose = _ref.expose;
 
       var _useProCurd = useProCurd(),
+          elementMap = _useProCurd.elementMap,
+          formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           formColumns = _useProCurd.formColumns,
+          getSignColumns = _useProCurd.getSignColumns,
           sendCurdEvent = _useProCurd.sendCurdEvent;
 
       var formRef = ref();
+      var columns = computed(function () {
+        if (props.signName) {
+          return getSignColumns(props.signName);
+        }
+
+        return formColumns.value;
+      });
+
+      var handleFinish = function handleFinish(values, originValues) {
+        if (attrs.onFinish) {
+          attrs.onFinish(values, originValues);
+          return;
+        }
 
-      var handleFinish = function handleFinish(values) {
         if (curdState.mode === CurdCurrentMode.EDIT) {
           //edit
           sendCurdEvent({
@@ -1531,15 +1783,22 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
         (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
       };
 
+      expose({
+        submit: function submit() {
+          var _formRef$value3;
+
+          (_formRef$value3 = formRef.value) === null || _formRef$value3 === void 0 ? void 0 : _formRef$value3.submit();
+        }
+      });
       return function () {
         var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
 
         return createVNode(Form, mergeProps({
           "ref": formRef
-        }, props, {
+        }, omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": formColumns.value,
+          "columns": columns.value,
           "model": curdState.detailData,
           "readonly": curdState.mode === CurdCurrentMode.DETAIL,
           "onFinish": handleFinish
@@ -1601,11 +1860,9 @@ var createCurdList = function createCurdList(SearchForm, Table) {
     setup: function setup(props, _ref) {
       var slots = _ref.slots;
 
-      var _useProModule = useProModule(),
-          elementMap = _useProModule.elementMap,
-          formElementMap = _useProModule.formElementMap;
-
       var _useProCurd = useProCurd(),
+          elementMap = _useProCurd.elementMap,
+          formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           searchColumns = _useProCurd.searchColumns,
           tableColumns = _useProCurd.tableColumns,
@@ -1719,6 +1976,114 @@ var createCurdList = function createCurdList(SearchForm, Table) {
   });
 };
 
+/**
+ * ProFormList ctx
+ */
+
+var ProFormListKey = Symbol("pro-form-list");
+var useProFormList = function useProFormList() {
+  return inject(ProFormListKey);
+};
+var provideProFormList = function provideProFormList(ctx) {
+  provide(ProFormListKey, ctx);
+};
+var FormListProvider = defineComponent({
+  props: {
+    pathList: {
+      type: Array
+    }
+  },
+  setup: function setup(props, _ref) {
+    var slots = _ref.slots;
+    provideProFormList({
+      pathList: props.pathList
+    });
+    return function () {
+      var _slots$default;
+
+      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
+    };
+  }
+});
+
+var createFormList = function createFormList(FormItem) {
+  return defineComponent({
+    props: _objectSpread2(_objectSpread2({}, FormItem.props), {}, {
+      //每行默认id
+      rowKey: {
+        type: String,
+        "default": "id"
+      }
+    }),
+    setup: function setup(props, _ref2) {
+      var slots = _ref2.slots;
+
+      var _useProForm = useProForm(),
+          formState = _useProForm.formState,
+          readonly = _useProForm.readonly;
+
+      var formListCtx = useProFormList();
+      var nameList = convertPathToList(props.name);
+      var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
+
+      var handleAdd = function handleAdd() {
+        var targetList = get(formState, path);
+
+        if (!isArray(targetList)) {
+          targetList = [];
+        }
+
+        targetList.push(_defineProperty({}, props.rowKey, new Date().valueOf()));
+        set(formState, path, targetList);
+      };
+
+      var handleRemove = function handleRemove(index) {
+        var targetList = get(formState, path);
+
+        if (size(targetList) <= 0) {
+          return;
+        }
+
+        targetList.splice(index, 1);
+      };
+
+      return function () {
+        var _slots$add;
+
+        return createVNode(FormItem, omit(props, "rowKey"), {
+          "default": function _default() {
+            return [map(get(formState, path), function (item, index) {
+              var _slots$default2, _slots$itemAdd, _slots$itemMinus;
+
+              return createVNode(FormListProvider, {
+                "key": item[props.rowKey] || index,
+                "pathList": [].concat(_toConsumableArray(path), [index])
+              }, {
+                "default": function _default() {
+                  return [createVNode("div", {
+                    "class": "pro-form-list-item"
+                  }, [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots), !readonly.value && createVNode(Fragment, null, [createVNode("div", {
+                    "class": "pro-form-list-item-add",
+                    "onClick": handleAdd
+                  }, [(_slots$itemAdd = slots.itemAdd) === null || _slots$itemAdd === void 0 ? void 0 : _slots$itemAdd.call(slots)]), createVNode("div", {
+                    "class": "pro-form-list-item-minus",
+                    "onClick": function onClick() {
+                      return handleRemove(index);
+                    }
+                  }, [(_slots$itemMinus = slots.itemMinus) === null || _slots$itemMinus === void 0 ? void 0 : _slots$itemMinus.call(slots)])])])];
+                }
+              });
+            }), !readonly.value && createVNode("div", {
+              "class": "pro-form-list-add",
+              "onClick": handleAdd
+            }, [(_slots$add = slots.add) === null || _slots$add === void 0 ? void 0 : _slots$add.call(slots)])];
+          }
+        });
+      };
+    }
+  });
+};
+
 var ProFormKey = Symbol("pro-form");
 var useProForm = function useProForm() {
   return inject(ProFormKey);
@@ -1730,24 +2095,24 @@ var provideProForm = function provideProForm(ctx) {
 
 var proFormProps = function proFormProps() {
   return {
-    /**
-     * 同 antd 或 element  form中的model
+    /**
+     * 同 antd 或 element  form中的model
      */
     model: {
       type: Object
     },
 
-    /**
-     *  子组件是否只读样式
+    /**
+     *  子组件是否只读样式
      */
     readonly: {
       type: Boolean,
       "default": undefined
     },
 
-    /**
-     *  FormComponent 根据此项来确定组件是否显示
-     *  rules 根据rules中方法生成showState对象
+    /**
+     *  FormComponent 根据此项来确定组件是否显示
+     *  rules 根据rules中方法生成showState对象
      */
     showState: {
       type: Object
@@ -1756,8 +2121,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否只读
+    /**
+     * 是否只读
      */
     readonlyState: {
       type: Object
@@ -1766,8 +2131,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 是否disabled
+    /**
+     * 是否disabled
      */
     disableState: {
       type: Object
@@ -1776,8 +2141,8 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     *
+    /**
+     *
      */
     columns: {
       type: Array
@@ -1786,30 +2151,30 @@ var proFormProps = function proFormProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * 录入控件集合
+    /**
+     * 录入控件集合
      */
     formElementMap: {
       type: Object
     },
 
-    /**
-     * 是否启用rules验证
+    /**
+     * 是否启用rules验证
      */
     needRules: {
       type: Boolean,
       "default": true
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -1899,7 +2264,9 @@ var createForm = function createForm(Form, Grid) {
         columns: columns,
         //
         formRef: formRef
-      }, props.provideExtra));
+      }, props.provideExtra)); //为了不warning ...
+
+      provideProFormList({});
       var invalidKeys = keys(proFormProps());
       var gridKeys = keys(omit(Grid.props, "items"));
       return function () {
@@ -1941,40 +2308,39 @@ var SearchMode;
 
 var proSearchFormProps = function proSearchFormProps() {
   return {
-    /**
-     * 需要监听的对象
+    /**
+     * 需要监听的对象
      */
     model: {
-      type: Object,
-      required: true
+      type: Object
     },
 
-    /**
-     * 初始化触发 onFinish
+    /**
+     * 初始化触发 onFinish
      */
     initEmit: {
       type: Boolean,
       "default": true
     },
 
-    /**
-     *  模式 自动触发或者手动触发 onFinish
+    /**
+     *  模式 自动触发或者手动触发 onFinish
      */
     searchMode: {
       type: String,
       "default": SearchMode.AUTO
     },
 
-    /**
-     * 配置 同ProForm中的columns
-     * 可以根据column中valueType计算出默认的debounceKeys
+    /**
+     * 配置 同ProForm中的columns
+     * 可以根据column中valueType计算出默认的debounceKeys
      */
     columns: {
       type: Array
     },
 
-    /**
-     * 需要debounce处理的字段
+    /**
+     * 需要debounce处理的字段
      */
     debounceKeys: {
       type: Array
@@ -1991,9 +2357,9 @@ var proSearchFormProps = function proSearchFormProps() {
   };
 };
 
-/**
- * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
- * 针对传入的model（监听对象）做相应的finish（回调）处理
+/**
+ * 该组件只是个模式，最终返回null，不做任何渲染，应配合着ProForm的包装类一起使用
+ * 针对传入的model（监听对象）做相应的finish（回调）处理
  */
 var createSearchForm = function createSearchForm(Form, Props) {
   return defineComponent({
@@ -2064,116 +2430,6 @@ var createSearchForm = function createSearchForm(Form, Props) {
   });
 };
 
-/**
- * ProFormList ctx
- */
-
-var ProFormListKey = Symbol("pro-form-list");
-var useProFormList = function useProFormList() {
-  return inject(ProFormListKey);
-};
-
-var provideProFormList = function provideProFormList(ctx) {
-  provide(ProFormListKey, ctx);
-};
-
-var FormListProvider = defineComponent({
-  props: {
-    pathList: {
-      type: Array
-    }
-  },
-  setup: function setup(props, _ref) {
-    var slots = _ref.slots;
-    provideProFormList({
-      pathList: props.pathList
-    });
-    return function () {
-      var _slots$default;
-
-      return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-    };
-  }
-});
-
-var createFormList = function createFormList(FormItem) {
-  return defineComponent({
-    props: _objectSpread2(_objectSpread2({}, FormItem.props), {}, {
-      //每行默认id
-      rowKey: {
-        type: String,
-        "default": "id"
-      }
-    }),
-    setup: function setup(props, _ref2) {
-      var slots = _ref2.slots;
-
-      var _useProForm = useProForm(),
-          formState = _useProForm.formState,
-          readonly = _useProForm.readonly;
-
-      var formListCtx = useProFormList();
-      var nameList = convertPathToList(props.name);
-      var path = formListCtx !== null && formListCtx !== void 0 && formListCtx.pathList ? [].concat(_toConsumableArray(formListCtx.pathList), _toConsumableArray(nameList)) : nameList;
-
-      var handleAdd = function handleAdd() {
-        var targetList = get(formState, path);
-
-        if (!isArray(targetList)) {
-          targetList = [];
-        }
-
-        targetList.push(_defineProperty({}, props.rowKey, new Date().valueOf()));
-        set(formState, path, targetList);
-      };
-
-      var handleRemove = function handleRemove(index) {
-        var targetList = get(formState, path);
-
-        if (size(targetList) <= 0) {
-          return;
-        }
-
-        targetList.splice(index, 1);
-      };
-
-      return function () {
-        var _slots$add;
-
-        return createVNode(FormItem, omit(props, "rowKey"), {
-          "default": function _default() {
-            return [map(get(formState, path), function (item, index) {
-              var _slots$default2, _slots$itemAdd, _slots$itemMinus;
-
-              return createVNode(FormListProvider, {
-                "key": item[props.rowKey] || index,
-                "pathList": [].concat(_toConsumableArray(path), [index])
-              }, {
-                "default": function _default() {
-                  return [createVNode("div", {
-                    "class": "pro-form-list-item"
-                  }, [(_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots), !readonly.value && createVNode(Fragment, null, [createVNode("div", {
-                    "class": "pro-form-list-item-add",
-                    "onClick": handleAdd
-                  }, [(_slots$itemAdd = slots.itemAdd) === null || _slots$itemAdd === void 0 ? void 0 : _slots$itemAdd.call(slots)]), createVNode("div", {
-                    "class": "pro-form-list-item-minus",
-                    "onClick": function onClick() {
-                      return handleRemove(index);
-                    }
-                  }, [(_slots$itemMinus = slots.itemMinus) === null || _slots$itemMinus === void 0 ? void 0 : _slots$itemMinus.call(slots)])])])];
-                }
-              });
-            }), !readonly.value && createVNode("div", {
-              "class": "pro-form-list-add",
-              "onClick": handleAdd
-            }, [(_slots$add = slots.add) === null || _slots$add === void 0 ? void 0 : _slots$add.call(slots)])];
-          }
-        });
-      };
-    }
-  });
-};
-
 var proFormItemProps = function proFormItemProps() {
   return {
     readonly: {
@@ -2452,4 +2708,4 @@ var createTable = function createTable(Table, Props) {
   });
 };
 
-export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProModule, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };
+export { CurdAction, CurdAddAction, CurdCurrentMode, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, findTargetInTree, findTargetListInTree, generateId, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };