Skip to content

Commit dcf9fd9

Browse files
committed
deepmerge change
1 parent 85264a0 commit dcf9fd9

File tree

6 files changed

+28
-13
lines changed

6 files changed

+28
-13
lines changed

README.md

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# FN-Scheme
1+
# FN-Scheme TS
22
#### Form schema component for Naive UI framework. Generate form from json like formkit schema component
33

44
P.S. alternative @chronicstone/vue-sweetforms
55

6-
- Package type: `es`
6+
- Package type: `ts files`
77

88

99
#### TREE
@@ -26,7 +26,7 @@ Import component
2626
```vue
2727
2828
<script setup type="ts">
29-
import { FnSchema, NaiveUISchema } from '@francyfox/fn-forms'
29+
import { FnSchema, NaiveUISchema } from "@francyfox/fn-forms/src/lib"
3030
3131
const formData = ref()
3232
const json = {
@@ -254,6 +254,11 @@ const formData = ref({
254254

255255
#### CHANGELOG
256256

257+
##### 0.1.0 - 0.1.3
258+
259+
- change deepmerge to deepmerge-ts
260+
- disable compile version. Only TS
261+
257262
##### v0.1.0
258263

259264
- fix import error

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Naive UI component. Generate form from json like formkit schema component",
44
"author": "hellisart <7info7web@gmail.com>",
55
"private": false,
6-
"version": "0.1.2",
6+
"version": "0.1.3",
77
"license": "MIT",
88
"repository": {
99
"type": "git",
@@ -25,7 +25,7 @@
2525
"src/lib"
2626
],
2727
"dependencies": {
28-
"deepmerge": "^4.3.1",
28+
"deepmerge-ts": "^5.1.0",
2929
"naive-ui": "^2.34.3",
3030
"vue": "^3.2.47"
3131
},

pnpm-lock.yaml

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/module/schema/schema.parser.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { nestedObjectByPath, resolve } from '../../helper/helper.path.ts';
22
import { Ref } from 'vue';
3-
import deepmerge from 'deepmerge'
3+
import { deepmerge } from 'deepmerge-ts';
44
import { renderElement } from '../../module/schema/schema.render.ts';
55
import { fnValueArguments, NaiveUITypes } from '../../module/schema/schema.model.ts';
66

@@ -27,7 +27,7 @@ export function updateValueHandler(argument: fnValueArguments, checked: boolean
2727
const { $props, v, path, formData } = argument;
2828
const inputDeep = nestedObjectByPath(path, v);
2929
const merged = deepmerge(formData, inputDeep, {
30-
arrayMerge: (_, sourceArray) => sourceArray, // TODO: need add overwrite by path (+ multipath)
30+
arrayMerge: (_: any, sourceArray: any) => sourceArray, // TODO: need add overwrite by path (+ multipath)
3131
});
3232
Object.assign(formData, merged);
3333

src/lib/module/schema/schema.render.ts

+1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export function renderElement(_el: NaiveUISchemaEl, formData: Ref<object>): VNod
6262
}
6363
}
6464

65+
console.log($props)
6566
// @ts-ignore
6667
return h(component, $props, renderChildren($children, formData));
6768
}

src/test/TestSchema.ts

+9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@ import type { NaiveUISchema } from '../lib/module/schema/schema.model';
33
export default [
44
{
55
$type: 'n-form',
6+
$props: {
7+
rules: {
8+
user: {
9+
name: {
10+
required: true
11+
}
12+
}
13+
}
14+
},
615
$children: [
716
{
817
$type: 'n-space',

0 commit comments

Comments
 (0)