@vue-start/pro 0.4.4 → 0.4.6

package/dist/index.es.js

@@ -1119,6 +1119,11 @@ var Curd = defineComponent({
           }
 
           return;
+      } //非 CurdAction 五种操作的其他请求
+
+
+      if (action && type === CurdSubAction.EXECUTE) {
+        sendRequest(action, values);
       }
     });
     var operateMap = reduce(props.operates, function (pair, item) {
@@ -1244,9 +1249,13 @@ var ProCurd = defineComponent({
     }), _curdOperateOpts);
     /****************************** columns分类 *************************************/
 
-    var requests = map(props.operates, function (item) {
+    var operates = map(props.operates, function (item) {
       var curdOpts = get(curdOperateOpts, item.action);
       return _objectSpread2(_objectSpread2({}, curdOpts), item);
+    }); //只取配置actor的项
+
+    var requests = filter$1(operates, function (item) {
+      return item.actor;
     });
     var moduleKeys = keys(omit(ProModule.props, "state", "requests"));
     expose({
@@ -1286,7 +1295,7 @@ var ProCurd = defineComponent({
           return [createVNode(Curd, mergeProps({
             "ref": curdRef
           }, omit.apply(void 0, [props].concat(_toConsumableArray(moduleKeys), ["curdState", "operates"])), {
-            "operates": requests
+            "operates": operates
           }), slots)];
         }
       });
@@ -1501,7 +1510,8 @@ var PageCurd = defineComponent({
 
     var _useProCurd = useProCurd(),
         rowKey = _useProCurd.rowKey,
-        curdState = _useProCurd.curdState;
+        curdState = _useProCurd.curdState,
+        refreshList = _useProCurd.refreshList;
 
     var dealList = function dealList(subAction) {
       if (subAction === CurdSubAction.PAGE) {
@@ -1587,6 +1597,13 @@ var PageCurd = defineComponent({
       }
     };
 
+    var dealDelete = function dealDelete(subAction) {
+      if (subAction === CurdSubAction.SUCCESS) {
+        //刷新列表
+        refreshList();
+      }
+    };
+
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1626,6 +1643,10 @@ var PageCurd = defineComponent({
             record: record
           });
           break;
+
+        case CurdAction.DELETE:
+          dealDelete(subAction);
+          break;
       }
     });
     return function () {
@@ -1962,7 +1983,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       };
 
       return function () {
-        var _curdState$listData, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
+        var _curdState$listData, _slots$start, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd, _slots$end;
 
         var tableProps = props.tableProps;
 
@@ -1988,7 +2009,9 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         var extra = slots.extra ? createVNode("div", {
           "class": "pro-curd-list-extra"
         }, [slots.extra()]) : null;
-        return createVNode(Fragment, null, [createVNode(SearchForm, mergeProps({
+        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
         }, omit(props.searchProps, "slots"), {
           "columns": searchColumns.value,
@@ -1999,7 +2022,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           }
         }, (_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", {
           "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$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)]);
       };
     }
   });

package/dist/index.js

@@ -1123,6 +1123,11 @@ var Curd = vue.defineComponent({
           }
 
           return;
+      } //非 CurdAction 五种操作的其他请求
+
+
+      if (action && type === exports.CurdSubAction.EXECUTE) {
+        sendRequest(action, values);
       }
     });
     var operateMap = lodash.reduce(props.operates, function (pair, item) {
@@ -1248,9 +1253,13 @@ var ProCurd = vue.defineComponent({
     }), _curdOperateOpts);
     /****************************** columns分类 *************************************/
 
-    var requests = lodash.map(props.operates, function (item) {
+    var operates = lodash.map(props.operates, function (item) {
       var curdOpts = lodash.get(curdOperateOpts, item.action);
       return _objectSpread2(_objectSpread2({}, curdOpts), item);
+    }); //只取配置actor的项
+
+    var requests = lodash.filter(operates, function (item) {
+      return item.actor;
     });
     var moduleKeys = lodash.keys(lodash.omit(ProModule.props, "state", "requests"));
     expose({
@@ -1290,7 +1299,7 @@ var ProCurd = vue.defineComponent({
           return [vue.createVNode(Curd, vue.mergeProps({
             "ref": curdRef
           }, lodash.omit.apply(void 0, [props].concat(_toConsumableArray(moduleKeys), ["curdState", "operates"])), {
-            "operates": requests
+            "operates": operates
           }), slots)];
         }
       });
@@ -1505,7 +1514,8 @@ var PageCurd = vue.defineComponent({
 
     var _useProCurd = useProCurd(),
         rowKey = _useProCurd.rowKey,
-        curdState = _useProCurd.curdState;
+        curdState = _useProCurd.curdState,
+        refreshList = _useProCurd.refreshList;
 
     var dealList = function dealList(subAction) {
       if (subAction === exports.CurdSubAction.PAGE) {
@@ -1591,6 +1601,13 @@ var PageCurd = vue.defineComponent({
       }
     };
 
+    var dealDelete = function dealDelete(subAction) {
+      if (subAction === exports.CurdSubAction.SUCCESS) {
+        //刷新列表
+        refreshList();
+      }
+    };
+
     useModuleEvent(function (_ref3) {
       var type = _ref3.type,
           payload = _ref3.payload,
@@ -1630,6 +1647,10 @@ var PageCurd = vue.defineComponent({
             record: record
           });
           break;
+
+        case exports.CurdAction.DELETE:
+          dealDelete(subAction);
+          break;
       }
     });
     return function () {
@@ -1966,7 +1987,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
       };
 
       return function () {
-        var _curdState$listData, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd;
+        var _curdState$listData, _slots$start, _props$searchProps, _slots$divide, _slots$divide2, _slots$footerStart, _slots$pagination, _curdState$listData2, _slots$footerEnd, _slots$end;
 
         var tableProps = props.tableProps;
 
@@ -1992,7 +2013,9 @@ var createCurdList = function createCurdList(SearchForm, Table) {
         var extra = slots.extra ? vue.createVNode("div", {
           "class": "pro-curd-list-extra"
         }, [slots.extra()]) : null;
-        return vue.createVNode(vue.Fragment, null, [vue.createVNode(SearchForm, vue.mergeProps({
+        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
         }, lodash.omit(props.searchProps, "slots"), {
           "columns": searchColumns.value,
@@ -2003,7 +2026,7 @@ var createCurdList = function createCurdList(SearchForm, Table) {
           }
         }, (_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", {
           "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$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)]);
       };
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "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": "4cadd260951f249478eabe6e9b21bdbeb802de4c"
+  "gitHead": "402c2cfa12b15d009ff6cb6cc46f672178ef21f0"
 }