fix: 修复SchemaForm和SchemaTransfer传值

刘汉宸
1 parent 2c8430c4
Showing 2 changed files with 20 additions and 9 deletions Show diff stats
packages/schema-form/index.vue
packages/schema-transfer/index.vue
@@ -4,14 +4,15 @@
       <template v-if="item.is">
         <z-form-item v-if="bindParam(item, 'if')" v-show="bindParam(item, 'show')" v-bind="bindItemProps(item)" :key="index">
           <slot v-if="$scopedSlots[item.prop]" :name="item.prop" :value="get(model, item.prop)" :onInput="value => onComponentInput({ value, item })" v-bind="slotProps"> </slot>
-          <item-render v-else :item="item" :value="get(model, item.prop)" :onInput="value => onComponentInput({ value, item })"></item-render>
+          <item-render v-else :item="item" :value="get(model, item.prop)" :model="model" :onInput="value => onComponentInput({ value, item })"></item-render>
           <slot :name="`label-${item.prop}`" slot="label" v-bind="slotProps"></slot>
           <slot :name="`error-${item.prop}`" slot="error" v-bind="slotProps"></slot>
         </z-form-item>
       </template>
       <template v-else>
         <z-form-item v-if="bindParam(item, 'if')" v-show="bindParam(item, 'show')" v-bind="bindItemProps(item)" :key="index" :value="get(model, item.prop)">
-          <slot :name="item.prop" :value="get(model, item.prop)" :onInput="value => onComponentInput({ value, item })" v-bind="slotProps"></slot>
+          <slot v-if="$scopedSlots[item.prop]" :name="item.prop" :value="get(model, item.prop)" :onInput="value => onComponentInput({ value, item })" v-bind="slotProps"> </slot>
+          <item-render v-else :item="item" :value="get(model, item.prop)" :model="model" :onInput="value => onComponentInput({ value, item })"></item-render>
         </z-form-item>
       </template>
     </template>
@@ -32,10 +33,9 @@ export default {
       render(h, context) {
         const props = context.props;
         const item = props.item || {};
-        let content = [];
+        let content = props.value;
         if (item.render && typeof item.render === 'function') {
-          console.log('render');
-          content = item.render(props.value, h);
+          content = [item.render(props.value, props.model, h)];
         }
         if (item.children) {
           if (Array.isArray(item.children)) {
@@ -58,7 +58,11 @@ export default {
           result[current] = item[current];
           return result;
         }, {});
-        return h(item.is, { props: _props, on: _on, ...otherAttrs }, content);
+        if (item.is) {
+          return h(item.is, { props: _props, on: _on, ...otherAttrs }, content);
+        } else {
+          return content;
+        }
       },
     },
   },
@@ -89,7 +93,7 @@ export default {
       return this.size || (this.$ELEMENT || {}).size;
     },
     _schemaProps() {
-      return { size: this._size, ...(this.schema.props || {}) };
+      return { size: this._size, ...(this.schema.props || {}), ...this.$attrs };
     },
     slotProps() {
       return {
@@ -128,7 +132,7 @@ export default {
       return item[key];
     },
     bindItemProps(item) {
-      const { children, is, props, on, ...other } = item || {};
+      const { children, is, props, on, render, ...other } = item || {};
       return Object.keys(other).reduce((result, current) => {
         result = { ...result, [current]: this.bindParam(item, current, item[current]) };
         return result;
@@ -35,6 +35,7 @@
       <div class="z-schema-transfer__content">
         <slot v-bind="_slotScope">
           <z-schema-page
+            ref="schema-page"
             :size="transferSize"
             :value-filter="valueFilter"
             :value-table="valueTable"
@@ -69,7 +70,7 @@
       </div>
       <div class="z-schema-transfer__content">
         <slot name="selected" v-bind="_slotScope">
-          <z-schema-table :size="transferSize" :value="value" :schema="schemaRight" @input="onInput">
+          <z-schema-table ref="schema-table" :size="transferSize" :value="value" :schema="schemaRight" @input="onInput">
             <template v-for="item in getSlotKeys('selected-', true)" #[item.name]="slotScope">
               <slot :name="item.slot" v-bind="{ ..._slotScope, ...slotScope }"></slot>
             </template>
@@ -209,6 +210,7 @@ export default {
         disabled: this.transferDisabled,
         choose: this.onChoose,
         remove: this.onRemove,
+        source: this.valueTable,
       };
       return [...methods].reduce((result, current) => {
         result[current] = this[current];
@@ -237,6 +239,11 @@ export default {
       }
       return false;
     },
+    search() {
+      if (this.$refs['schema-page']) {
+        this.$refs['schema-page'].search();
+      }
+    },
     deselect(value) {
       return value.filter(item => !this.valueKeys.includes(item[this.valueKey]));
     },