diff --git a/.gitignore b/.gitignore index 5cae84fdc..634c03c54 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ node_modules /coverage /package-lock.json /schema.json +/npm diff --git a/.npmignore b/.npmignore index 1e994cf40..3616d95ef 100644 --- a/.npmignore +++ b/.npmignore @@ -23,3 +23,4 @@ fis-conf.js /.travis.yml /deploy-gh-pages.sh /tsconfig.json +/npm diff --git a/package.json b/package.json index cf1f504ba..484deb775 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amis", - "version": "1.0.18-beta.11", + "version": "1.0.18-beta.12", "description": "一种MIS页面生成工具", "main": "lib/index.js", "scripts": { diff --git a/publish.sh b/publish.sh index ac04fb223..46388ca4b 100644 --- a/publish.sh +++ b/publish.sh @@ -19,4 +19,4 @@ sed -i '' -e 's/\"name\": \"amis\"/\"name\": \"@fex\/amis\"/g' ./package.json npm publish --registry=http://registry.npm.baidu-int.com cd .. -rm -rf npm +# rm -rf npm diff --git a/src/factory.tsx b/src/factory.tsx index a17e20012..57f422209 100644 --- a/src/factory.tsx +++ b/src/factory.tsx @@ -533,8 +533,6 @@ class SchemaRenderer extends React.Component { ...schema }; - // @ts-ignore - delete schema.$ref; path = path.replace(/(?!.*\/).*/, schema.type); } diff --git a/src/renderers/Form/index.tsx b/src/renderers/Form/index.tsx index 0210501c8..ea7e36d78 100644 --- a/src/renderers/Form/index.tsx +++ b/src/renderers/Form/index.tsx @@ -1212,7 +1212,6 @@ export default class Form extends React.Component { ...control, ...getExprProperties(control, store.data) }; - delete control.$ref; } else { subSchema.control = control = { ...control,