@vue-start/pro 0.4.5 → 0.4.7

package/dist/index.d.ts

@@ -562,6 +562,10 @@ declare const proCurdAddOrEditProps: () => {
     signName: {
         type: StringConstructor;
     };
+    modelName: {
+        type: StringConstructor;
+        default: string;
+    };
     operateBar: {
         type: BooleanConstructor;
         default: boolean;

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({
@@ -1272,7 +1281,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 () {
@@ -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)];
         }
       });
@@ -1735,6 +1744,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1836,8 +1850,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({
@@ -1974,12 +1988,13 @@ 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;
 
         var rewriteTableProps = _objectSpread2(_objectSpread2({
-          elementMap: elementMap
+          elementMap: elementMap,
+          columns: tableColumns.value
         }, omit(tableProps, "slots", "operate")), {}, {
           operate: mergeWith({
             items: tableOperateItems
@@ -1992,7 +2007,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
         });
@@ -2000,10 +2014,12 @@ 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({
-          "formElementMap": formElementMap
+        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,
+          "columns": searchColumns.value
         }, omit(props.searchProps, "slots"), {
-          "columns": searchColumns.value,
           "onFinish": executeSearchWithResetPage
         }), _objectSpread2({
           "default": function _default() {
@@ -2011,7 +2027,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({
@@ -1276,7 +1285,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 () {
@@ -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)];
         }
       });
@@ -1739,6 +1748,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1840,8 +1854,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({
@@ -1978,12 +1992,13 @@ 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;
 
         var rewriteTableProps = _objectSpread2(_objectSpread2({
-          elementMap: elementMap
+          elementMap: elementMap,
+          columns: tableColumns.value
         }, lodash.omit(tableProps, "slots", "operate")), {}, {
           operate: lodash.mergeWith({
             items: tableOperateItems
@@ -1996,7 +2011,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
         });
@@ -2004,10 +2018,12 @@ 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({
-          "formElementMap": formElementMap
+        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,
+          "columns": searchColumns.value
         }, lodash.omit(props.searchProps, "slots"), {
-          "columns": searchColumns.value,
           "onFinish": executeSearchWithResetPage
         }), _objectSpread2({
           "default": function _default() {
@@ -2015,7 +2031,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.5",
+  "version": "0.4.7",
   "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": "817582dc319eea2d525e93234e02185d0844a207"
+  "gitHead": "797728f9f41829dae1311c7284d0bfbbdae6524f"
 }