@vue-start/pro 0.4.1 → 0.4.2

package/dist/index.d.ts

@@ -558,6 +558,9 @@ declare const ProPageCurd: vue.DefineComponent<ProPageCurdProps, {}, {}, {}, {},
 declare const createCurdDesc: (Descriptions: any, DescriptionsItem: any) => any;
 
 declare const proCurdAddOrEditProps: () => {
+    signName: {
+        type: StringConstructor;
+    };
     operateBar: {
         type: BooleanConstructor;
         default: boolean;

package/dist/index.es.js

@@ -1633,6 +1633,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       //重写Item content
       renderItem: {
         type: Function
+      },
+      //标记名称
+      signName: {
+        type: String
       }
     }),
     setup: function setup(props, _ref) {
@@ -1641,10 +1645,12 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       var _useProCurd = useProCurd(),
           getItemVNode = _useProCurd.getItemVNode,
           curdState = _useProCurd.curdState,
-          descColumns = _useProCurd.descColumns;
+          descColumns = _useProCurd.descColumns,
+          getSignColumns = _useProCurd.getSignColumns;
 
       var descVNodes = computed(function () {
-        return map(descColumns.value, function (item) {
+        var columns = props.signName ? getSignColumns(props.signName) : descColumns.value;
+        return map(columns, function (item) {
           var _slot;
 
           var _props$renderItem;
@@ -1681,6 +1687,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
 var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   return {
+    //标记名称
+    signName: {
+      type: String
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1712,20 +1722,36 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
 
 var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
   return defineComponent({
+    inheritAttrs: false,
     props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          attrs = _ref.attrs,
+          expose = _ref.expose;
 
       var _useProCurd = useProCurd(),
           elementMap = _useProCurd.elementMap,
           formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           formColumns = _useProCurd.formColumns,
+          getSignColumns = _useProCurd.getSignColumns,
           sendCurdEvent = _useProCurd.sendCurdEvent;
 
       var formRef = ref();
+      var columns = computed(function () {
+        if (props.signName) {
+          return getSignColumns(props.signName);
+        }
+
+        return formColumns.value;
+      });
+
+      var handleFinish = function handleFinish(values, originValues) {
+        if (attrs.onFinish) {
+          attrs.onFinish(values, originValues);
+          return;
+        }
 
-      var handleFinish = function handleFinish(values) {
         if (curdState.mode === CurdCurrentMode.EDIT) {
           //edit
           sendCurdEvent({
@@ -1757,15 +1783,22 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
         (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
       };
 
+      expose({
+        submit: function submit() {
+          var _formRef$value3;
+
+          (_formRef$value3 = formRef.value) === null || _formRef$value3 === void 0 ? void 0 : _formRef$value3.submit();
+        }
+      });
       return function () {
         var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
 
         return createVNode(Form, mergeProps({
           "ref": formRef
-        }, props, {
+        }, omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": formColumns.value,
+          "columns": columns.value,
           "model": curdState.detailData,
           "readonly": curdState.mode === CurdCurrentMode.DETAIL,
           "onFinish": handleFinish

package/dist/index.js

@@ -1637,6 +1637,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       //重写Item content
       renderItem: {
         type: Function
+      },
+      //标记名称
+      signName: {
+        type: String
       }
     }),
     setup: function setup(props, _ref) {
@@ -1645,10 +1649,12 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
       var _useProCurd = useProCurd(),
           getItemVNode = _useProCurd.getItemVNode,
           curdState = _useProCurd.curdState,
-          descColumns = _useProCurd.descColumns;
+          descColumns = _useProCurd.descColumns,
+          getSignColumns = _useProCurd.getSignColumns;
 
       var descVNodes = vue.computed(function () {
-        return lodash.map(descColumns.value, function (item) {
+        var columns = props.signName ? getSignColumns(props.signName) : descColumns.value;
+        return lodash.map(columns, function (item) {
           var _slot;
 
           var _props$renderItem;
@@ -1685,6 +1691,10 @@ var createCurdDesc = function createCurdDesc(Descriptions, DescriptionsItem) {
 
 var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
   return {
+    //标记名称
+    signName: {
+      type: String
+    },
     //是否使用operate bar
     operateBar: {
       type: Boolean,
@@ -1716,20 +1726,36 @@ var proCurdAddOrEditProps = function proCurdAddOrEditProps() {
 
 var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
   return vue.defineComponent({
+    inheritAttrs: false,
     props: _objectSpread2(_objectSpread2({}, Form.props), proCurdAddOrEditProps()),
     setup: function setup(props, _ref) {
-      var slots = _ref.slots;
+      var slots = _ref.slots,
+          attrs = _ref.attrs,
+          expose = _ref.expose;
 
       var _useProCurd = useProCurd(),
           elementMap = _useProCurd.elementMap,
           formElementMap = _useProCurd.formElementMap,
           curdState = _useProCurd.curdState,
           formColumns = _useProCurd.formColumns,
+          getSignColumns = _useProCurd.getSignColumns,
           sendCurdEvent = _useProCurd.sendCurdEvent;
 
       var formRef = vue.ref();
+      var columns = vue.computed(function () {
+        if (props.signName) {
+          return getSignColumns(props.signName);
+        }
+
+        return formColumns.value;
+      });
+
+      var handleFinish = function handleFinish(values, originValues) {
+        if (attrs.onFinish) {
+          attrs.onFinish(values, originValues);
+          return;
+        }
 
-      var handleFinish = function handleFinish(values) {
         if (curdState.mode === exports.CurdCurrentMode.EDIT) {
           //edit
           sendCurdEvent({
@@ -1761,15 +1787,22 @@ var createCurdForm = function createCurdForm(Form, Button, convertFormProps) {
         (_formRef$value2 = formRef.value) === null || _formRef$value2 === void 0 ? void 0 : _formRef$value2.submit();
       };
 
+      expose({
+        submit: function submit() {
+          var _formRef$value3;
+
+          (_formRef$value3 = formRef.value) === null || _formRef$value3 === void 0 ? void 0 : _formRef$value3.submit();
+        }
+      });
       return function () {
         var _slots$divide, _slots$operateStart, _slots$operateCenter, _slots$operateEnd, _slots$default;
 
         return vue.createVNode(Form, vue.mergeProps({
           "ref": formRef
-        }, props, {
+        }, lodash.omit(attrs, "onFinish"), props, {
           "elementMap": props.elementMap || elementMap,
           "formElementMap": props.formElementMap || formElementMap,
-          "columns": formColumns.value,
+          "columns": columns.value,
           "model": curdState.detailData,
           "readonly": curdState.mode === exports.CurdCurrentMode.DETAIL,
           "onFinish": handleFinish

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "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": "adf3a978c60ccb84172c2287b67d2e5ead0d0dcf"
+  "gitHead": "079ca75a0fdb8df918eafe7b5e985d06bc0b9ccf"
 }