@baic/yolk-cli 2.0.1-alpha.17 → 2.0.1-alpha.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baic/yolk-cli",
-  "version": "2.0.1-alpha.17",
+  "version": "2.0.1-alpha.20",
   "author": "Baic <303394539@qq.com>",
   "license": "MIT",
   "bin": {
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2af7aa132ff4637e6155fd10835b4eca04a5f095"
+  "gitHead": "9b4da8d56218198e56c7d1ece4c046a08e077ba4"
 }

package/templates/miniprogram/.gitignore.tpl

@@ -11,7 +11,7 @@
 
 # production
 /build
-dist/
+/dist
 
 # misc
 .DS_Store

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/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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Form } from 'antd-mobile';
+import { Input, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'Input',
+        name: 'Input',
+        rules: 'required',
+      })(<Input maxLength={5} />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Form } from 'antd-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'default',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Form } from 'antd-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'decimal',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput decimal={3} />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Form } from 'antd-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'zeroStart',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput zeroStart />)}
+    </Form>
+  );
+};

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

@@ -0,0 +1,17 @@
+import * as React from 'react';
+import { Form } from 'antd-mobile';
+import { NumberInput, useForm } from '@baic/yolk-mobile';
+
+export default () => {
+  const [form] = useForm();
+  const { createFormItem } = form;
+  return (
+    <Form form={form}>
+      {createFormItem({
+        label: 'negative',
+        name: 'NumberInput',
+        rules: 'required',
+      })(<NumberInput negative />)}
+    </Form>
+  );
+};

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

@@ -1,21 +1,39 @@
 import * as React from 'react';
 
-import { Tabs } from 'antd-mobile';
+import _ from 'lodash';
+
+import { Tabs, Collapse } from 'antd-mobile';
 
 import BarCode from './examples/BarCode';
 import Iconfont from './examples/Iconfont';
+import Input from './examples/Input';
 import Loading from './examples/Loading';
+import NumberInput_1 from './examples/NumberInput/1';
+import NumberInput_2 from './examples/NumberInput/2';
+import NumberInput_3 from './examples/NumberInput/3';
+import NumberInput_4 from './examples/NumberInput/4';
 import QrCode from './examples/QrCode';
 import Required from './examples/Required';
 import TimerButton from './examples/TimerButton';
 import usePreload from './examples/usePreload';
 
 const { Tab } = Tabs;
+const { Panel } = Collapse;
 
-const tabs: Record<string, React.FunctionComponent> = {
+const tabs: Record<
+  string,
+  React.FunctionComponent | Record<string, React.FunctionComponent>
+> = {
   BarCode,
   Iconfont,
+  Input,
   Loading,
+  NumberInput: {
+    NumberInput_1,
+    NumberInput_2,
+    NumberInput_3,
+    NumberInput_4,
+  },
   QrCode,
   Required,
   TimerButton,
@@ -25,14 +43,33 @@ const tabs: Record<string, React.FunctionComponent> = {
 export default () => {
   const keys = Object.keys(tabs);
   return (
-    <Tabs defaultActiveKey={keys[0]}>
-      {keys.map(key => {
+    <Tabs defaultActiveKey={keys[4]}>
+      {keys.map((key) => {
         const tab = tabs[key];
-        return (
-          <Tab key={key} title={key}>
-            {React.createElement(tab)}
-          </Tab>
-        );
+        if (_.isFunction(tab)) {
+          return (
+            <Tab key={key} title={key}>
+              {React.createElement(tab)}
+            </Tab>
+          );
+        }
+        if (_.isObject(tab)) {
+          const keys2 = Object.keys(tab);
+          return (
+            <Tab key={key} title={key}>
+              <Collapse accordion defaultActiveKey={keys2[0]}>
+                {keys2.map((key2) => {
+                  const tab2 = tab[key2];
+                  return (
+                    <Panel key={key2} title={key2}>
+                      {React.createElement(tab2)}
+                    </Panel>
+                  );
+                })}
+              </Collapse>
+            </Tab>
+          );
+        }
       })}
     </Tabs>
   );

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/4.tsx

@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { Radio, Divider } from 'antd';
-import { RadioChangeEvent } from 'antd/lib/radio/interface';
-import { Grid } from '@baic/yolk-web';
-import { GridProps } from '@baic/yolk-web/lib/grid';
+import { RadioChangeEvent } from 'antd/es/radio/interface';
+import { Grid, GridProps } from '@baic/yolk-web';
 
 export default () => {
   const [size, setSize] = React.useState<GridProps['size']>('middle');

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/examples/Wrapper.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Button, Divider, Radio } from 'antd';
-import { RadioChangeEvent } from 'antd/lib/radio/interface';
-import { Wrapper } from '@baic/yolk-web';
-import { WrapperInstance, Mode } from '@baic/yolk-web/lib/wrapper';
+import { RadioChangeEvent } from 'antd/es/radio/interface';
+import { Wrapper, WrapperInstance } from '@baic/yolk-web';
+import { Mode } from '@baic/yolk-web/lib/wrapper';
 
 export default () => {
   const ref = React.useRef<WrapperInstance>(null);

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,