@blueking/bkui-form 0.0.42-beta.5 → 0.0.42-beta.7

package/dist/bkui-form-es.js

@@ -634,16 +634,25 @@ function mergeDeep(target) {
   }
   if (!sources.length) return target;
   var source = sources.shift();
-  if (isObj(target) && isObj(source)) {
-    for (var key in source) {
-      if (isObj(source[key])) {
-        if (!target[key]) Object.assign(target, _defineProperty({}, key, {}));
-        mergeDeep(target[key], source[key]);
-      } else {
-        Object.assign(target, _defineProperty({}, key, source[key]));
+  if (source === undefined) {
+    return target;
+  }
+  Object.entries(source).forEach(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      key = _ref2[0],
+      value = _ref2[1];
+    var targetValue = target[key];
+    if (isObj(value)) {
+      if (!(key in target)) {
+        target[key] = {};
+      } else if (!isObj(targetValue)) {
+        target[key] = {};
       }
+      mergeDeep(target[key], value);
+    } else {
+      target[key] = value;
     }
-  }
+  });
   return mergeDeep.apply(void 0, [target].concat(sources));
 }
 function isArguments(object) {
@@ -11462,10 +11471,7 @@ var CollapseGroupWidget = Vue.extend({
   props: _objectSpread2(_objectSpread2({}, props), {}, {
     type: {
       type: String,
-      default: 'default',
-      validator: function validator(value) {
-        return ['default', 'normal', 'card'].includes(value);
-      }
+      default: 'default' // 'default', 'normal', 'card'
     },
     showTitle: {
       type: Boolean,
@@ -11484,6 +11490,10 @@ var CollapseGroupWidget = Vue.extend({
     verifiable: {
       type: Boolean,
       default: false
+    },
+    collapseStyle: {
+      type: String,
+      default: 'normal' // normal: 修改后的样式参看BCS，default: 组件样式
     }
   }),
   data: function data() {
@@ -11494,7 +11504,6 @@ var CollapseGroupWidget = Vue.extend({
   render: function render(h) {
     var _this$schema,
       _this = this;
-    var collapseStyle = {};
     var collapseTitleStyle = {
       background: '#f5f7fa',
       'border-radius': '2px',
@@ -11527,9 +11536,9 @@ var CollapseGroupWidget = Vue.extend({
           hideArrow: true,
           name: key
         },
-        class: ['mb15']
+        class: _this.collapseStyle === 'normal' ? ['mb15'] : []
       }, [h('div', {
-        style: collapseTitleStyle
+        style: _this.collapseStyle === 'normal' ? collapseTitleStyle : {}
       }, [h('i', {
         class: ['bk-icon icon-down-shape mr5'],
         style: _objectSpread2(_objectSpread2({}, collapseIconStyle), {}, {
@@ -11553,7 +11562,7 @@ var CollapseGroupWidget = Vue.extend({
     return h(FieldGroupWrap, {
       props: _objectSpread2({}, groupWrapProps)
     }, [h(registry.getBaseWidget('collapse'), {
-      style: collapseStyle,
+      class: this.collapseStyle,
       props: {
         value: this.activeName
       },