@vue-start/pro 0.4.7 → 0.4.9

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;
@@ -606,6 +613,13 @@ declare const proCurdListProps: () => {
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };
@@ -625,6 +639,13 @@ declare const createCurdList: (SearchForm: any, Table: any) => vue.DefineCompone
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };
@@ -642,6 +663,13 @@ declare const createCurdList: (SearchForm: any, Table: any) => vue.DefineCompone
     tableProps: {
         type: PropType<Record<string, any>>;
     };
+    paginationProps: {
+        type: PropType<Record<string, any>>;
+    };
+    showPagination: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     pageState: {
         type: PropType<TPageState>;
     };
@@ -910,31 +938,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
@@ -957,13 +960,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) {
@@ -1899,6 +1820,14 @@ var proCurdListProps = function proCurdListProps() {
     tableProps: {
       type: Object
     },
+    //pagination是否展示
+    paginationProps: {
+      type: Object
+    },
+    showPagination: {
+      type: Boolean,
+      "default": true
+    },
     //pageState
     pageState: {
       type: Object
@@ -2025,7 +1954,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           "default": function _default() {
             return [props.extraInSearch && extra];
           }
-        }, (_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.slots)), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots.table ? slots.table(rewriteTableProps) : createVNode(Table, rewriteTableProps, 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", {
+        }, (_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.slots)), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots.table ? slots.table(rewriteTableProps) : createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), props.showPagination && createVNode("div", {
           "class": "pro-curd-list-footer"
         }, [(_slots$footerStart = slots.footerStart) === null || _slots$footerStart === void 0 ? void 0 : _slots$footerStart.call(slots), (_slots$pagination = slots.pagination) === null || _slots$pagination === void 0 ? void 0 : _slots$pagination.call(slots, pageState, (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total, handleSearch), (_slots$footerEnd = slots.footerEnd) === null || _slots$footerEnd === void 0 ? void 0 : _slots$footerEnd.call(slots)]), (_slots$end = slots.end) === null || _slots$end === void 0 ? void 0 : _slots$end.call(slots)]);
       };
@@ -2754,4 +2683,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) {
@@ -1903,6 +1824,14 @@ var proCurdListProps = function proCurdListProps() {
     tableProps: {
       type: Object
     },
+    //pagination是否展示
+    paginationProps: {
+      type: Object
+    },
+    showPagination: {
+      type: Boolean,
+      "default": true
+    },
     //pageState
     pageState: {
       type: Object
@@ -2029,7 +1958,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           "default": function _default() {
             return [props.extraInSearch && extra];
           }
-        }, (_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.slots)), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots.table ? slots.table(rewriteTableProps) : vue.createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), vue.createVNode("div", {
+        }, (_props$searchProps = props.searchProps) === null || _props$searchProps === void 0 ? void 0 : _props$searchProps.slots)), (_slots$divide = slots.divide) === null || _slots$divide === void 0 ? void 0 : _slots$divide.call(slots), !props.extraInSearch && extra, slots.table ? slots.table(rewriteTableProps) : vue.createVNode(Table, rewriteTableProps, tableProps === null || tableProps === void 0 ? void 0 : tableProps.slots), (_slots$divide2 = slots.divide2) === null || _slots$divide2 === void 0 ? void 0 : _slots$divide2.call(slots), props.showPagination && vue.createVNode("div", {
           "class": "pro-curd-list-footer"
         }, [(_slots$footerStart = slots.footerStart) === null || _slots$footerStart === void 0 ? void 0 : _slots$footerStart.call(slots), (_slots$pagination = slots.pagination) === null || _slots$pagination === void 0 ? void 0 : _slots$pagination.call(slots, pageState, (_curdState$listData2 = curdState.listData) === null || _curdState$listData2 === void 0 ? void 0 : _curdState$listData2.total, handleSearch), (_slots$footerEnd = slots.footerEnd) === null || _slots$footerEnd === void 0 ? void 0 : _slots$footerEnd.call(slots)]), (_slots$end = slots.end) === null || _slots$end === void 0 ? void 0 : _slots$end.call(slots)]);
       };
@@ -2777,9 +2706,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.7",
+  "version": "0.4.9",
   "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": "797728f9f41829dae1311c7284d0bfbbdae6524f"
+  "gitHead": "9075107632a73989f5ade116c22cbc0250f29340"
 }