@vue-start/pro 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.1](https://github.com/zxeryu/vue-start/compare/@vue-start/pro@0.3.0...@vue-start/pro@0.3.1) (2022-08-23)
+
+### Bug Fixes
+
+- **pro:** merge bug ([1155218](https://github.com/zxeryu/vue-start/commit/115521827bc31c11091c23d16a596bd825aedcf1))
+
 # [0.3.0](https://github.com/zxeryu/vue-start/compare/@vue-start/pro@0.2.0...@vue-start/pro@0.3.0) (2022-08-22)
 
 ### Bug Fixes

package/dist/index.es.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, reactive, inject, h, provide, ref, createVNode, mergeProps, Fragment } from 'vue';
-import { map, isString, forEach, filter as filter$1, keys, omit, isArray, split, isFunction, get, isEmpty, isObject, mergeWith, reduce, sortBy, pick, debounce, size, some, clone, set, isBoolean, merge as merge$1 } from 'lodash';
+import { map, isString, forEach, filter as filter$1, keys, omit, isArray, split, isFunction, get, isEmpty, isObject, mergeWith, reduce, sortBy, pick, debounce, size, some, clone, set, 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';
@@ -1759,8 +1759,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -1773,36 +1773,36 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * loading
+    /**
+     * loading
      */
     loading: {
       type: Boolean
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     pagination: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -1821,7 +1821,7 @@ var ProTable = defineComponent({
 
       var columns = map(mergeColumns, function (item) {
         //merge公共item
-        var nextItem = merge$1(props.column, item);
+        var nextItem = _objectSpread2(_objectSpread2({}, props.column), item);
 
         if (!item.customRender) {
           nextItem.customRender = function (_ref2) {

package/dist/index.js

@@ -1763,8 +1763,8 @@ var proTableProps = function proTableProps() {
       type: String
     },
 
-    /**
-     * 公共column，会merge到columns item中
+    /**
+     * 公共column，会merge到columns item中
      */
     column: {
       type: Object
@@ -1777,36 +1777,36 @@ var proTableProps = function proTableProps() {
       type: Object
     },
 
-    /**
-     * 展示控件集合，readonly模式下使用这些组件渲染
+    /**
+     * 展示控件集合，readonly模式下使用这些组件渲染
      */
     elementMap: {
       type: Object
     },
 
-    /**
-     * loading
+    /**
+     * loading
      */
     loading: {
       type: Boolean
     },
 
-    /**
-     * 序号
+    /**
+     * 序号
      */
     serialNumber: {
       type: Boolean
     },
 
-    /**
-     * 分页
+    /**
+     * 分页
      */
     pagination: {
       type: Object
     },
 
-    /**
-     * provide传递
+    /**
+     * provide传递
      */
     provideExtra: {
       type: Object
@@ -1825,7 +1825,7 @@ var ProTable = vue.defineComponent({
 
       var columns = lodash.map(mergeColumns, function (item) {
         //merge公共item
-        var nextItem = lodash.merge(props.column, item);
+        var nextItem = _objectSpread2(_objectSpread2({}, props.column), item);
 
         if (!item.customRender) {
           nextItem.customRender = function (_ref2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-start/pro",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "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": "111a06e1350911d6315f2e19a2c3abbaa64d8092"
+  "gitHead": "48bbd0237d16a648f2dac6ee0502854a1cbc2104"
 }