@vue-start/pro 0.4.6 → 0.4.8

package/dist/index.d.ts

@@ -31,6 +31,13 @@ declare type TOption = {
     disabled?: boolean;
 };
 declare type TOptions = TOption[];
+declare type TreeOption = {
+    label?: string;
+    value: string | number;
+    disabled?: boolean;
+    children?: TreeOption[];
+};
+declare type TreeOptions = TreeOption[];
 declare type TColumn = {
     title?: string | VNode;
     dataIndex?: string | number;
@@ -562,6 +569,10 @@ declare const proCurdAddOrEditProps: () => {
     signName: {
         type: StringConstructor;
     };
+    modelName: {
+        type: StringConstructor;
+        default: string;
+    };
     operateBar: {
         type: BooleanConstructor;
         default: boolean;
@@ -906,31 +917,6 @@ declare const proFormListProps: () => {
 declare type ProFormListProps = Partial<ExtractPropTypes<ReturnType<typeof proFormListProps>>>;
 declare const createFormList: (FormItem: any) => any;
 
-declare type TData = Record<string, any>;
-/**
- * 根据value从treeData中找到对象
- * @param data
- * @param value
- * @param fieldNames
- * @param cb 对象：同步   方法：回调，可以理解为异步
- */
-declare const findTargetInTree: (data: TData[], value: TOption["value"], fieldNames: FieldNames, cb: {
-    target?: TData | undefined;
-    index?: number | undefined;
-    list?: TData[] | undefined;
-} | ((index: number, target: TData, list: TData[]) => void)) => void;
-/**
- * 根据value从treeData中找出对象及父列表
- * @param data
- * @param value
- * @param fieldNames
- * @param cb
- * @param parent
- */
-declare const findTargetListInTree: (data: TData[], value: TOption["value"], fieldNames: FieldNames, cb: {
-    list?: TData[] | undefined;
-} | ((list?: TData[] | undefined) => void), parent?: TData[]) => void;
-
 /**
  * 剔除showState或showStateRules规则为!true的值
  * @param values
@@ -953,13 +939,9 @@ declare const convertPathToList: (path: undefined | string | number | (string |
  */
 declare const mergeStateToList: (list: Record<string, any>[], listState: Record<string, any>, id: string | number | ((item: Record<string, any>) => string | number)) => Record<string, any>[];
 
-/**
- * 唯一id
- */
-declare const generateId: () => string;
 /**
  * ref 传递
  */
 declare const createExpose: (methods: string[], targetRef: Ref$1) => {};
 
-export { BooleanObjType, BooleanRulesObjType, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, FieldNames, FormItemProps, GridProps, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOperateItem, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, InternalNamePath, NamePath, ProCurd, ProCurdAddOrEditProps, ProCurdListProps, ProCurdProps, ProFormItemProps, ProFormListProps, ProFormProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProPageCurd, ProPageCurdProps, ProSearchFormProps, ProTableProps, RequestAction, SearchMode, TActionEvent, TActionState, TColumn, TColumns, TCurdActionEvent, TData, TDefaultValueType, TElementMap, TOption, TOptions, TPageState, TTableColumn, TTableColumns, TValueType, 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 };
+export { BooleanObjType, BooleanRulesObjType, CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, FieldNames, FormItemProps, GridProps, ICurdAction, ICurdAddAction, ICurdCurrentMode, ICurdOperateOpts, ICurdState, ICurdSubAction, IElementConfig, IHighConfig, IListData, IOperateItem, IProCurdProvide, IProFormProvideExtra, IProModuleProvide, IProTableProvide, IProTableProvideExtra, IRequestOpts, ISearchMode, ITableOperate, InternalNamePath, NamePath, ProCurd, ProCurdAddOrEditProps, ProCurdListProps, ProCurdProps, ProFormItemProps, ProFormListProps, ProFormProps, ProModalCurd, ProModalCurdProps, ProModule, ProModuleProps, ProPageCurd, ProPageCurdProps, ProSearchFormProps, ProTableProps, RequestAction, SearchMode, TActionEvent, TActionState, TColumn, TColumns, TCurdActionEvent, TDefaultValueType, TElementMap, TOption, TOptions, TPageState, TTableColumn, TTableColumns, TValueType, TreeOption, TreeOptions, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };

package/dist/index.es.js

@@ -1,5 +1,5 @@
 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 { map, isString, forEach, reduce, size, get, set, pick, omit, isArray, some, keys, isFunction, head, isObject, 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';
@@ -754,78 +754,6 @@ 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
@@ -904,15 +832,8 @@ var mergeStateToList = function mergeStateToList(list, listState, id) {
   });
 };
 
-/**
- * 唯一id
- */
-
-var generateId = function generateId() {
-  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-};
-/**
- * ref 传递
+/**
+ * ref 传递
  */
 
 var createExpose = function createExpose(methods, targetRef) {
@@ -1281,7 +1202,7 @@ var ProCurd = defineComponent({
           params[_key - 1] = arguments[_key];
         }
 
-        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendEvent.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
+        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendRequest.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
       }
     });
     return function () {
@@ -1744,6 +1665,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1845,8 +1771,8 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps, for
         }, omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": columns.value,
-          "model": curdState.detailData,
+          "columns": props.columns || columns.value,
+          "model": props.model || curdState[props.modelName],
           "readonly": curdState.mode === CurdCurrentMode.DETAIL,
           "onFinish": handleFinish
         }, convertFormProps === null || convertFormProps === void 0 ? void 0 : convertFormProps(curdState)), _objectSpread2({
@@ -1988,7 +1914,8 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         var tableProps = props.tableProps;
 
         var rewriteTableProps = _objectSpread2(_objectSpread2({
-          elementMap: elementMap
+          elementMap: elementMap,
+          columns: tableColumns.value
         }, omit(tableProps, "slots", "operate")), {}, {
           operate: mergeWith({
             items: tableOperateItems
@@ -2001,7 +1928,6 @@ var createCurdList = function createCurdList(SearchForm, Table) {
             page: pageState.page,
             pageSize: pageState.pageSize
           },
-          columns: tableColumns.value,
           loading: curdState.listLoading,
           dataSource: (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
         });
@@ -2012,9 +1938,9 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         return createVNode(Fragment, null, [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), slots.search ? slots.search({
           executeSearchWithResetPage: executeSearchWithResetPage
         }) : createVNode(SearchForm, mergeProps({
-          "formElementMap": formElementMap
+          "formElementMap": formElementMap,
+          "columns": searchColumns.value
         }, omit(props.searchProps, "slots"), {
-          "columns": searchColumns.value,
           "onFinish": executeSearchWithResetPage
         }), _objectSpread2({
           "default": function _default() {
@@ -2749,4 +2675,4 @@ var createTable = function createTable(Table, Props, tableMethods) {
   });
 };
 
-export { CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, 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 };
+export { CurdAction, CurdAddAction, CurdCurrentMode, CurdMethods, CurdSubAction, ProCurd, ProModalCurd, ProModule, ProPageCurd, RequestAction, SearchMode, Wrapper, convertPathToList, createCurdDesc, createCurdForm, createCurdList, createExpose, createForm, createFormItemCompFn, createFormList, createGrid, createSearchForm, createTable, defaultPage, getColumnFormItemName, getColumnValueType, getFirstPropName, getFormItemEl, getItemEl, getValidValues, mergeStateToList, provideProCurd, provideProFormList, provideProModule, renderElement, renderElements, useComposeRequestActor, useDoneRequestActor, useFailedRequestActor, useModuleEvent, useProCurd, useProForm, useProFormList, useProModule, useProTable };

package/dist/index.js

@@ -758,78 +758,6 @@ exports.CurdAddAction = void 0;
   CurdAddAction["CONTINUE"] = "CONTINUE";
 })(exports.CurdAddAction || (exports.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 = lodash.findIndex(data, function (item) {
-    return lodash.get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
-  });
-
-  if (index > -1) {
-    if (lodash.isFunction(cb)) {
-      cb(index, data[index], data);
-    } else {
-      cb.index = index;
-      cb.target = data[index];
-      cb.list = data;
-    }
-
-    return;
-  }
-
-  lodash.forEach(data, function (item) {
-    var children = lodash.get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
-
-    if (lodash.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 = lodash.find(data, function (item) {
-    return lodash.get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || treeDefaultNames.value) === value;
-  });
-
-  if (target) {
-    if (lodash.isFunction(cb)) {
-      cb([].concat(_toConsumableArray(parent), [target]));
-    } else {
-      cb.list = [].concat(_toConsumableArray(parent), [target]);
-    }
-
-    return;
-  }
-
-  lodash.forEach(data, function (item) {
-    var children = lodash.get(item, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || treeDefaultNames.children);
-
-    if (lodash.size(children) > 0) {
-      findTargetListInTree(children, value, fieldNames, cb, [].concat(_toConsumableArray(parent), [item]));
-    }
-  });
-};
-
 /**
  * 剔除showState或showStateRules规则为!true的值
  * @param values
@@ -908,15 +836,8 @@ var mergeStateToList = function mergeStateToList(list, listState, id) {
   });
 };
 
-/**
- * 唯一id
- */
-
-var generateId = function generateId() {
-  return Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-};
-/**
- * ref 传递
+/**
+ * ref 传递
  */
 
 var createExpose = function createExpose(methods, targetRef) {
@@ -1285,7 +1206,7 @@ var ProCurd = vue.defineComponent({
           params[_key - 1] = arguments[_key];
         }
 
-        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendEvent.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
+        (_moduleRef$value2 = moduleRef.value) === null || _moduleRef$value2 === void 0 ? void 0 : _moduleRef$value2.sendRequest.apply(_moduleRef$value2, [requestNameOrAction].concat(params));
       }
     });
     return function () {
@@ -1748,6 +1669,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1849,8 +1775,8 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps, for
         }, lodash.omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": columns.value,
-          "model": curdState.detailData,
+          "columns": props.columns || columns.value,
+          "model": props.model || curdState[props.modelName],
           "readonly": curdState.mode === exports.CurdCurrentMode.DETAIL,
           "onFinish": handleFinish
         }, convertFormProps === null || convertFormProps === void 0 ? void 0 : convertFormProps(curdState)), _objectSpread2({
@@ -1992,7 +1918,8 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         var tableProps = props.tableProps;
 
         var rewriteTableProps = _objectSpread2(_objectSpread2({
-          elementMap: elementMap
+          elementMap: elementMap,
+          columns: tableColumns.value
         }, lodash.omit(tableProps, "slots", "operate")), {}, {
           operate: lodash.mergeWith({
             items: tableOperateItems
@@ -2005,7 +1932,6 @@ var createCurdList = function createCurdList(SearchForm, Table) {
             page: pageState.page,
             pageSize: pageState.pageSize
           },
-          columns: tableColumns.value,
           loading: curdState.listLoading,
           dataSource: (_curdState$listData = curdState.listData) === null || _curdState$listData === void 0 ? void 0 : _curdState$listData.dataSource
         });
@@ -2016,9 +1942,9 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         return vue.createVNode(vue.Fragment, null, [(_slots$start = slots.start) === null || _slots$start === void 0 ? void 0 : _slots$start.call(slots), slots.search ? slots.search({
           executeSearchWithResetPage: executeSearchWithResetPage
         }) : vue.createVNode(SearchForm, vue.mergeProps({
-          "formElementMap": formElementMap
+          "formElementMap": formElementMap,
+          "columns": searchColumns.value
         }, lodash.omit(props.searchProps, "slots"), {
-          "columns": searchColumns.value,
           "onFinish": executeSearchWithResetPage
         }), _objectSpread2({
           "default": function _default() {
@@ -2772,9 +2698,6 @@ exports.createGrid = createGrid;
 exports.createSearchForm = createSearchForm;
 exports.createTable = createTable;
 exports.defaultPage = defaultPage;
-exports.findTargetInTree = findTargetInTree;
-exports.findTargetListInTree = findTargetListInTree;
-exports.generateId = generateId;
 exports.getColumnFormItemName = getColumnFormItemName;
 exports.getColumnValueType = getColumnValueType;
 exports.getFirstPropName = getFirstPropName;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "> TODO: description",
   "author": "zx <zxpstudy@163.com>",
   "homepage": "https://github.com/zxeryu/vue-start#readme",
@@ -32,5 +32,5 @@
     "vue": ">=3.x",
     "vue-router": ">=4.x"
   },
-  "gitHead": "402c2cfa12b15d009ff6cb6cc46f672178ef21f0"
+  "gitHead": "abed29975a9db75dcc076220d3ce0c6ba5df98b6"
 }