@baic/yolk-cli 2.0.1-alpha.19 → 2.0.1-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.0.1-alpha.19",
+  "version": "2.0.1-alpha.22",
   "author": "Baic <303394539@qq.com>",
   "license": "MIT",
   "bin": {
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c3d4195438dd2150c0b18f5bf1362dfee197cd6"
+  "gitHead": "7b7722ccf2814b5e4f6e3ece0985807863e1493e"
 }

package/templates/miniprogram/src/app.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 
-import { Provider } from '@baic/yolk-taro-base';
-
-import { Provider as UIProvider } from '@baic/yolk-miniprogram';
+import { Provider } from '@baic/yolk-miniprogram';
 
 import request from '@/common/request';
 
@@ -13,7 +11,7 @@ interface Props {
 }
 
 export default ({ children }: Props) => (
-  <Provider request={request}>
-    <UIProvider inputMaxLength={40}>{children}</UIProvider>
+  <Provider request={request} inputMaxLength={40}>
+    {children}
   </Provider>
 );

package/templates/miniprogram/src/common/request.ts

@@ -1,4 +1,4 @@
-import { Request } from '@baic/yolk-taro-base';
+import { Request } from '@baic/yolk-miniprogram';
 import { REQUEST_HOST } from '@/constants';
 
 export default new Request({

package/templates/miniprogram/src/pages/demo/index.module.scss.d.ts

@@ -0,0 +1,5 @@
+declare const styles: {
+  readonly "page": string;
+};
+export = styles;
+

package/templates/miniprogram/src/pages/index/index.module.scss.d.ts

@@ -0,0 +1,5 @@
+declare const styles: {
+  readonly "page": string;
+};
+export = styles;
+

package/templates/miniprogram/src/theme.scss

@@ -1,4 +1,4 @@
 /* Custom Theme */
-$color-brand: #6eca5b;
-$color-brand-light: #92d784;
-$color-brand-dark: #58a249;
+// $color-brand: #6eca5b;
+// $color-brand-light: #92d784;
+// $color-brand-dark: #58a249;

package/templates/mobile/src/app.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 
-import { Provider } from '@baic/yolk-browser-base';
-
-import { Provider as WebProvider } from '@baic/yolk-mobile';
+import { Provider } from '@baic/yolk-mobile';
 
 import request from '@/common/request';
 
@@ -10,15 +8,14 @@ import '@baic/yolk-mobile/lib/style/index.less';
 
 export function rootContainer(container: React.ReactNode) {
   return (
-    <Provider request={request}>
-      <WebProvider
-        iconfontScriptUrl={[
-          '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
-          '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
-        ]}
-      >
-        {container}
-      </WebProvider>
+    <Provider
+      request={request}
+      iconfontScriptUrl={[
+        '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
+        '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
+      ]}
+    >
+      {container}
     </Provider>
   );
 }

package/templates/mobile/src/common/request.ts

@@ -1,3 +1,3 @@
-import { Request } from '@baic/yolk-browser-base';
+import { Request } from '@baic/yolk-mobile';
 
 export default new Request();

package/templates/mobile/src/pages/demo/examples/Input.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd-mobile';
-import { useForm } from '@baic/yolk-mobile-form';
-import { Input } from '@baic/yolk-mobile';
+import { Input, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/mobile/src/pages/demo/examples/NumberInput/1.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd-mobile';
-import { useForm } from '@baic/yolk-mobile-form';
-import { NumberInput } from '@baic/yolk-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/mobile/src/pages/demo/examples/NumberInput/2.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd-mobile';
-import { useForm } from '@baic/yolk-mobile-form';
-import { NumberInput } from '@baic/yolk-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/mobile/src/pages/demo/examples/NumberInput/3.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd-mobile';
-import { useForm } from '@baic/yolk-mobile-form';
-import { NumberInput } from '@baic/yolk-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/mobile/src/pages/demo/examples/NumberInput/4.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd-mobile';
-import { useForm } from '@baic/yolk-mobile-form';
-import { NumberInput } from '@baic/yolk-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
 
 export default () => {
   const [form] = useForm();

package/templates/web/src/app.tsx

@@ -1,8 +1,6 @@
 import * as React from 'react';
 
-import { Provider } from '@baic/yolk-browser-base';
-
-import { Provider as WebProvider } from '@baic/yolk-web';
+import { Provider } from '@baic/yolk-web';
 
 import request from '@/common/request';
 
@@ -10,16 +8,15 @@ import '@baic/yolk-web/lib/style/index.less';
 
 export function rootContainer(container: React.ReactNode) {
   return (
-    <Provider request={request}>
-      <WebProvider
-        inputMaxLength={40}
-        iconfontScriptUrl={[
-          '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
-          '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
-        ]}
-      >
-        {container}
-      </WebProvider>
+    <Provider
+      request={request}
+      inputMaxLength={40}
+      iconfontScriptUrl={[
+        '//at.alicdn.com/t/font_1788044_0dwu4guekcwr.js',
+        '//at.alicdn.com/t/font_1788592_a5xf2bdic3u.js',
+      ]}
+    >
+      {container}
     </Provider>
   );
 }

package/templates/web/src/common/request.ts

@@ -1,3 +1,3 @@
-import { Request } from '@baic/yolk-browser-base';
+import { Request } from '@baic/yolk-web';
 
 export default new Request();

package/templates/web/src/pages/demo/examples/BankInput.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd';
-import { useForm } from '@baic/yolk-web-form';
-import { BankInput } from '@baic/yolk-web';
+import { BankInput, useForm } from '@baic/yolk-web';
 
 export default () => {
   const [form] = useForm();

package/templates/web/src/pages/demo/examples/Grid/5.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd';
-import { useForm } from '@baic/yolk-web-form';
-import { Grid, Input } from '@baic/yolk-web';
+import { Grid, Input, useForm } from '@baic/yolk-web';
 
 export default () => {
   const [form] = useForm();

package/templates/web/src/pages/demo/examples/Input/2.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Form, Button, Divider } from 'antd';
-import { useForm } from '@baic/yolk-web-form';
+import { useForm } from '@baic/yolk-web';
 import {
   Config,
   Input,

package/templates/web/src/pages/demo/examples/PagingTable.tsx

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { PagingTable, Input } from '@baic/yolk-web';
+
+export default () => {
+  return (
+    <PagingTable
+      url=""
+      columns={[
+        {
+          dataIndex: 'name',
+          title: 'name',
+        },
+      ]}
+      search={({ createFormItem }) => [
+        createFormItem({
+          name: 'Input',
+        })(<Input />),
+      ]}
+    />
+  );
+};

package/templates/web/src/pages/demo/examples/RangeNumber/2.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd';
-import { useForm } from '@baic/yolk-web-form';
-import { RangeNumber } from '@baic/yolk-web';
+import { RangeNumber, useForm } from '@baic/yolk-web';
 
 export default () => {
   const [form] = useForm();

package/templates/web/src/pages/demo/examples/SearchLayout.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { Form } from 'antd';
-import { useForm } from '@baic/yolk-web-form';
+import { useForm } from '@baic/yolk-web';
 import {
   SearchLayout,
   Input,

package/templates/web/src/pages/demo/index.tsx

@@ -25,6 +25,7 @@ import LinkButton3 from './examples/LinkButton/3';
 import Loading from './examples/Loading';
 import MobileInput from './examples/MobileInput';
 import NumberInput from './examples/NumberInput';
+import PagingTable from './examples/PagingTable';
 import QrCode from './examples/QrCode';
 import RangeNumber1 from './examples/RangeNumber/1';
 import RangeNumber2 from './examples/RangeNumber/2';
@@ -74,6 +75,7 @@ const tabs: Record<
   Loading,
   MobileInput,
   NumberInput,
+  PagingTable,
   QrCode,
   RangeNumber: {
     RangeNumber1,