diff --git a/package.json b/package.json index 29d80388c8..278e2eac89 100644 --- a/package.json +++ b/package.json @@ -57,10 +57,10 @@ "dev:rtl": "VITE_RTL=rtl vite --open --force", "dev:jrkf": "VITE_APP_PROJECT_ID=jrkf vite --open --force", "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn", - "predev:taro": "SKIPDD=1 pnpm run update:taro:entry", + "predev:taro": "pnpm run update:taro:entry", "dev:taro": "pnpm --dir ./packages/nutui-taro-demo dev", "dev:taro:h5": "pnpm dev:taro h5", - "predev:jdtaro": "SKIPDD=1 pnpm run update:taro:entry", + "predev:jdtaro": "pnpm run update:taro:entry", "dev:jdtaro": "JD=1 pnpm --dir ./packages/nutui-taro-demo dev", "dev:jdtaro:jdharmonycpp": "pnpm run clone:jdharmony cpp && pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev:jdharmonycpp", "dev:jdtaro:jdharmony": "pnpm run clone:jdharmony && pnpm run update:taro:entry && JD=1 pnpm --dir ./packages/nutui-taro-demo dev:jdharmony", @@ -70,7 +70,7 @@ "build:taro:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp node scripts/build-taro.mjs", "build:site": "npm run checked && vite build --config vite.config.site.mts", "build:site:jmapp": "npm run checked && VITE_APP_PROJECT_ID=jmapp vite build", - "prebuild:taro:site": "SKIPDD=1 pnpm run update:taro:entry", + "prebuild:taro:site": "pnpm run update:taro:entry", "build:taro:site": "npm run checked:taro && npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5", "build:jdtaro:site": "npm run checked:taro && npm run generate:file:taro:pages && JD=1 pnpm --dir ./packages/nutui-taro-demo build:h5", "build:taro:site:jmapp": "npm run checked:taro && VITE_APP_PROJECT_ID=jmapp npm run generate:file:taro:pages && pnpm --dir ./packages/nutui-taro-demo build:h5", diff --git a/packages/nutui-taro-demo/src/pages/index/index.tsx b/packages/nutui-taro-demo/src/pages/index/index.tsx index 142e73f41d..8a7160e870 100644 --- a/packages/nutui-taro-demo/src/pages/index/index.tsx +++ b/packages/nutui-taro-demo/src/pages/index/index.tsx @@ -16,6 +16,7 @@ import { SearchBar } from '@/packages/searchbar/searchbar.taro' import pkg from '@/packages/../config.json' import packageJson from '@/packages/../../package.json' import './index.scss' +import { harmony } from '../../../../../src/utils/platform-taro' const navs = pkg.nav @@ -81,7 +82,7 @@ const Index = () => { )} {nav.packages.map((com) => - com.show && com.taro && com.dd && (!search || new RegExp(search, 'ig').test(com.name.toLowerCase())) ? ( + com.show && com.taro && (harmony() ? com.dd : true) && (!search || new RegExp(search, 'ig').test(com.name.toLowerCase())) ? ( { - item.packages.forEach((element) => { - const { name, version, dd } = element - // 通过 pre 命令在 h5 和小程序预览或构建的时候,去掉鸿蒙适配的限制,从而在预览H5 和小程序时展示出未适配鸿蒙的组件 - // 例如 Form 组件未适配鸿蒙但适配了 H5 和小程序,启动 H5或小程序开发环境后,Form 组件并未被编译到开发环境中。导致无法查看 Form 组件。 - if (!dd && !process.env.SKIPDD) return // 未适配不导出 - if (specialComponent(name)) return - adaptedArray.push({ - ...element, - lowercaseName: element.name.toLowerCase(), - enName: item.enName, - }) - }) -}) -// 子组件 -const childAdaptedArray = [ - 'cellgroup', - 'row', - 'col', - 'griditem', - 'swiperitem', - 'hoverbuttonitem', - 'avatargroup', - 'icon', - 'tabpane', -] - // 更新 app.config.ts 文件 const createConfig = async () => { const configRef = [] diff --git a/src/packages/form/form.taro.tsx b/src/packages/form/form.taro.tsx index 06c2dcedc6..48f95510c5 100644 --- a/src/packages/form/form.taro.tsx +++ b/src/packages/form/form.taro.tsx @@ -1,12 +1,13 @@ import React, { ReactNode } from 'react' import classNames from 'classnames' +import { Form as TForm, FormProps as TFormProps } from '@tarojs/components' import { Context } from './context' import { SECRET, useForm } from './useform.taro' -import { BasicComponent, ComponentDefaults } from '@/utils/typings' +import { ComponentDefaults } from '@/utils/typings' import Cell from '@/packages/cell/index.taro' import { FormInstance } from '@/packages/form/types' -export interface FormProps extends BasicComponent { +export interface FormProps extends TFormProps { footer: ReactNode initialValues: any name: string @@ -48,6 +49,7 @@ export const Form = React.forwardRef>( labelPosition, starPosition, form, + ...rest } = { ...defaultProps, ...props, @@ -77,7 +79,8 @@ export const Form = React.forwardRef>( } return ( -
>( {footer} ) : null} -
+ ) } )