@blueking/bkui-form 0.0.26 → 0.0.28

package/dist/bkui-form-umd.js

@@ -1925,51 +1925,6 @@
     }
   });
 
-  var _excluded$4 = ["name"];
-  var ObjectField = Vue__default["default"].extend({
-    name: 'ObjectField',
-    functional: true,
-    props: props,
-    render: function render(h, ctx) {
-      var _ctx$props = ctx.props,
-          schema = _ctx$props.schema,
-          path = _ctx$props.path,
-          layout = _ctx$props.layout,
-          rootData = _ctx$props.rootData;
-      var properties = orderProperties(Object.keys(schema.properties), schema['ui:order']);
-      var vNodeList = properties.map(function (name) {
-        var curPath = Path.getCurPath(path, name);
-        var lastProp = curPath.split('.').pop();
-        var layoutConfig = Layout.findLayoutByProp(lastProp, layout.group || []) || {};
-        return h(SchemaField, _objectSpread2(_objectSpread2({}, ctx.data), {}, {
-          key: curPath,
-          props: _objectSpread2(_objectSpread2({}, ctx.props), {}, {
-            schema: schema.properties[name],
-            required: Schema.isRequired(schema, name),
-            path: curPath,
-            layout: layoutConfig,
-            removeable: false // todo: 不往下传递可删除属性
-
-          })
-        }));
-      });
-
-      var _Schema$getGroupWrap = Schema.getGroupWrap(schema),
-          name = _Schema$getGroupWrap.name,
-          vnodeData = _objectWithoutProperties(_Schema$getGroupWrap, _excluded$4); // todo: wrap组件不要透传ctx.data，不然会引起组件无限递归问题
-
-
-      return h(name, mergeDeep({
-        props: _objectSpread2(_objectSpread2({}, ctx.props), {}, {
-          value: Path.getPathVal(rootData, path),
-          path: path
-        }),
-        style: _objectSpread2({}, ctx.data.style || {}),
-        on: _objectSpread2({}, ctx.data.on || {})
-      }, vnodeData), _toConsumableArray(vNodeList));
-    }
-  });
-
   /* eslint-disable @typescript-eslint/no-unused-vars */
 
   var getContext = function getContext(instance) {
@@ -10421,7 +10376,7 @@
   }();
   var events = new FormEvent();
 
-  var _excluded$3 = ["url", "params"],
+  var _excluded$4 = ["url", "params"],
       _excluded2 = ["name"];
   var Widget = Vue__default["default"].extend({
     name: 'Widget',
@@ -10529,7 +10484,7 @@
                     break;
                   }
 
-                  url = xhrConfig.url, params = xhrConfig.params, reset = _objectWithoutProperties(xhrConfig, _excluded$3);
+                  url = xhrConfig.url, params = xhrConfig.params, reset = _objectWithoutProperties(xhrConfig, _excluded$4);
                   _this3$httpAdapter = _this3.httpAdapter, _this3$httpAdapter$re = _this3$httpAdapter.request, http = _this3$httpAdapter$re === void 0 ? request : _this3$httpAdapter$re, responseParse = _this3$httpAdapter.responseParse;
                   _context.prev = 4;
                   _this3.loading = true;
@@ -10666,6 +10621,58 @@
     }
   });
 
+  var _excluded$3 = ["name"];
+  var ObjectField = Vue__default["default"].extend({
+    name: 'ObjectField',
+    functional: true,
+    props: props,
+    render: function render(h, ctx) {
+      var _ctx$props = ctx.props,
+          schema = _ctx$props.schema,
+          path = _ctx$props.path,
+          layout = _ctx$props.layout,
+          rootData = _ctx$props.rootData;
+      var properties = orderProperties(Object.keys(schema.properties || {}), schema['ui:order']);
+      var vNodeList = [];
+
+      if (properties.length) {
+        vNodeList = properties.map(function (name) {
+          var curPath = Path.getCurPath(path, name);
+          var lastProp = curPath.split('.').pop();
+          var layoutConfig = Layout.findLayoutByProp(lastProp, layout.group || []) || {};
+          return h(SchemaField, _objectSpread2(_objectSpread2({}, ctx.data), {}, {
+            key: curPath,
+            props: _objectSpread2(_objectSpread2({}, ctx.props), {}, {
+              schema: schema.properties[name],
+              required: Schema.isRequired(schema, name),
+              path: curPath,
+              layout: layoutConfig,
+              removeable: false // todo: 不往下传递可删除属性
+
+            })
+          }));
+        });
+      } else if (Schema.getUiComponent(schema)) {
+        // 如果object属性没有配置 Properties，但是有ui:component属性，那个直接渲染对应的组件
+        vNodeList = [h(Widget, _objectSpread2({}, ctx.data))];
+      }
+
+      var _Schema$getGroupWrap = Schema.getGroupWrap(schema),
+          name = _Schema$getGroupWrap.name,
+          vnodeData = _objectWithoutProperties(_Schema$getGroupWrap, _excluded$3); // todo: wrap组件不要透传ctx.data，不然会引起组件无限递归问题
+
+
+      return h(name, mergeDeep({
+        props: _objectSpread2(_objectSpread2({}, ctx.props), {}, {
+          value: Path.getPathVal(rootData, path),
+          path: path
+        }),
+        style: _objectSpread2({}, ctx.data.style || {}),
+        on: _objectSpread2({}, ctx.data.on || {})
+      }, vnodeData), _toConsumableArray(vNodeList));
+    }
+  });
+
   var StringField = Vue__default["default"].extend({
     name: 'StringField',
     functional: true,
@@ -11762,7 +11769,7 @@
     methods: {
       handleInput: function handleInput(v) {
         if (this.$attrs.type === 'number') {
-          this.$emit('input', isNaN(v) ? v : Number(v));
+          this.$emit('input', isNaN(v) || v === '' ? v : Number(v));
         } else {
           this.$emit('input', v);
         }
@@ -11868,13 +11875,16 @@
       props: props$1,
       data: function data() {
         return {
-          rootData: {}
+          rootData: {},
+          formKey: 'bk-ui-form'
         };
       },
       watch: {
-        schema: function schema() {
+        schema: function schema(newSchema, oldSchema) {
+          if (JSON.stringify(newSchema) === JSON.stringify(oldSchema)) return;
           this.validateSchema(this.schema);
           this.initFormData();
+          this.formKey = "bk-ui-form-".concat(new Date().getTime());
         },
         context: {
           handler: function handler(ctx) {
@@ -11924,6 +11934,7 @@
         var self = this;
         return h(registry.getBaseWidget('form'), {
           ref: 'bkui-form',
+          key: this.formKey,
           props: {
             model: this.value,
             formType: this.formType,