@vue-start/pro 0.4.6 → 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

@@ -1281,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 () {
@@ -1744,6 +1744,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1845,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({
@@ -1988,7 +1993,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 +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
         });
@@ -2012,9 +2017,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() {

package/dist/index.js

@@ -1285,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 () {
@@ -1748,6 +1748,11 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
     signName: {
       type: String
     },
+    //form model 绑定的curdState中的对象
+    modelName: {
+      type: String,
+      "default": "detailData"
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1849,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({
@@ -1992,7 +1997,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 +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
         });
@@ -2016,9 +2021,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() {

package/package.json

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