@baic/yolk-cli 2.1.0-alpha.23 → 2.1.0-alpha.231

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/List/4.tsx

@@ -1,8 +1,10 @@
-import * as React from 'react';
+import { useCallback, useMemo } from 'react';
+
 import { Image } from 'antd-mobile';
+
 import { List, ListVirtualizedScrollEvent } from '@baic/yolk-mobile';
 
-const rowCount = 100;
+const rowCount = 100000;
 
 const item = {
   avatar:
@@ -14,13 +16,10 @@ const item = {
 const mock = Array(rowCount).fill(item);
 
 export default () => {
-  const onScrollHandler = React.useCallback(
-    async (e: ListVirtualizedScrollEvent) => {
-      console.log(e);
-    },
-    [],
-  );
-  const virtualizedMemo = React.useMemo(
+  const onScrollHandler = useCallback(async (e: ListVirtualizedScrollEvent) => {
+    console.log(e);
+  }, []);
+  const virtualizedMemo = useMemo(
     () => ({
       height: 500,
       rowHeight: 60,
@@ -29,7 +28,7 @@ export default () => {
     [onScrollHandler],
   );
   return (
-    <List header="拖拽" virtualized={virtualizedMemo} data={mock}>
+    <List header="虚拟化" virtualized={virtualizedMemo} data={mock}>
       {({ name, avatar, description }, index, e) => {
         return (
           <List.Item

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/Loading.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Loading } from '@baic/yolk-mobile';
 
 export default () => (

package/templates/{ice-mobile-native → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/1.tsx

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

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/2.tsx

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

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/3.tsx

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

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/NumberInput/4.tsx

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

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/PagingList/1.tsx

@@ -1,6 +1,5 @@
-import * as React from 'react';
 import { PagingList } from '@baic/yolk-mobile';
 
 export default () => {
-  return <PagingList url=""/>;
+  return <PagingList url="" />;
 };

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/QrCode.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { QrCode } from '@baic/yolk-mobile';
 
 export default () => <QrCode value="https://www.baidu.com" />;

package/templates/{ice-mobile-native → umi-mobile-uni-app}/src/pages/demo/examples/Required.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { Required } from '@baic/yolk-mobile';
 
 export default () => <Required>必填</Required>;

package/templates/{ice-mobile-h5+app → umi-mobile-uni-app}/src/pages/demo/examples/TimerButton.tsx

@@ -1,4 +1,3 @@
-import * as React from 'react';
 import { TimerButton } from '@baic/yolk-mobile';
 
 export default () => <TimerButton>验证码</TimerButton>;

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/examples/usePreload.tsx

@@ -1,6 +1,6 @@
-import * as React from 'react';
 import { Util } from '@baic/yolk';
 import { usePreload } from '@baic/yolk-mobile';
+
 export default () => {
   const [wrap] = usePreload(async () => {
     await Util.delay(1000);

package/templates/{ice-mobile → umi-mobile-uni-app}/src/pages/demo/index.tsx

@@ -1,8 +1,9 @@
-import * as React from 'react';
+import { isFunction, isObject } from 'lodash';
 
-import _ from 'lodash';
+import type { FunctionComponent } from 'react';
+import { createElement } from 'react';
 
-import { Tabs, Collapse } from 'antd-mobile';
+import { Collapse, Tabs } from 'antd-mobile';
 
 import BarCode from './examples/BarCode';
 import Iconfont from './examples/Iconfont';
@@ -27,7 +28,7 @@ const { Panel } = Collapse;
 
 const tabs: Record<
   string,
-  React.FunctionComponent | Record<string, React.FunctionComponent>
+  FunctionComponent | Record<string, FunctionComponent>
 > = {
   BarCode,
   Iconfont,
@@ -55,14 +56,14 @@ export default () => {
     <Tabs defaultActiveKey={keys[0]}>
       {keys.map((key) => {
         const tab = tabs[key];
-        if (_.isFunction(tab)) {
+        if (isFunction(tab)) {
           return (
             <Tab key={key} title={key}>
-              {React.createElement(tab)}
+              {createElement(tab)}
             </Tab>
           );
         }
-        if (_.isObject(tab)) {
+        if (isObject(tab)) {
           const keys2 = Object.keys(tab);
           return (
             <Tab key={key} title={key}>
@@ -71,7 +72,7 @@ export default () => {
                   const tab2 = tab[key2];
                   return (
                     <Panel key={key2} title={key2}>
-                      {React.createElement(tab2)}
+                      {createElement(tab2)}
                     </Panel>
                   );
                 })}
@@ -79,9 +80,8 @@ export default () => {
             </Tab>
           );
         }
+        return null;
       })}
     </Tabs>
   );
 };
-
-// export default () => <PagingList_1 />;

package/templates/{ice-mobile-native → umi-mobile-uni-app}/src/pages/index.tsx

@@ -1,3 +1 @@
-import * as React from 'react';
-
 export default () => <div>Hello world</div>;

package/templates/umi-mobile-uni-app/src/types/user.d.ts

@@ -0,0 +1,3 @@
+export type User = {
+  id?: string;
+};

package/templates/umi-mobile-uni-app/tsconfig.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./src/.umi/tsconfig.json"
+}

package/templates/umi-mobile-uni-app/typings.d.ts

@@ -0,0 +1 @@
+import '@umijs/max/typings';

package/templates/umi-mobile-uni-app/uni-app/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" 
+  package="xxx">
+    <application>
+        <!--meta-data-->
+		
+    </application>
+</manifest>

package/templates/umi-mobile-uni-app/uni-app/App.vue

@@ -0,0 +1,28 @@
+<script lang="ts">
+	export default {
+		onLaunch: function () {
+			// #ifndef APP-PLUS
+			console.log('App Launch');
+			// #endif
+		},
+		onShow: function () {
+			// #ifndef APP-PLUS
+			console.log('App Show');
+			// #endif
+		},
+		onHide: function () {
+			// #ifndef APP-PLUS
+			console.log('App Hide');
+			// #endif
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss">
+	/*每个页面公共css */
+	// #ifndef APP-PLUS
+
+	// #endif
+</style>

package/templates/umi-mobile-uni-app/uni-app/androidPrivacy.json

@@ -0,0 +1,22 @@
+{
+    "version" : "1.0.0",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "default",
+    "backToExit" : "true",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "进入应用前，你需先同意<a href=\"\">《服务协议》</a>和<a href=\"\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : true,
+        "visitorEntry" : false,
+        "showAlways" : true
+    }
+}

package/templates/umi-mobile-uni-app/uni-app/assets/apple-app-site-association

@@ -0,0 +1,11 @@
+{
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "",
+        "paths": [""]
+      }
+    ]
+  }
+}

package/templates/umi-mobile-uni-app/uni-app/common/constants.ts

@@ -0,0 +1,5 @@
+export const NAME = 'demo';
+
+export const REQUEST_HOST = 'https://xxx';
+
+export const H5_INDEX = `${REQUEST_HOST}/#/`;

package/templates/umi-mobile-uni-app/uni-app/common/request.ts

@@ -0,0 +1,118 @@
+import { REQUEST_HOST } from './constants';
+
+type Options = { baseURL: string };
+
+export type RequestOptions = {
+  loading?: boolean;
+  message?: boolean;
+  needLogin?: boolean;
+};
+
+type ResponseData<T = any> = {
+  code?: string | number;
+  success?: boolean;
+  message?: string;
+  data?: T;
+};
+
+export const getRandomString = (maxLength?: number): string => {
+  return `${Math.random()
+    .toString(36)
+    .substring(2, maxLength && maxLength >= 0 ? maxLength + 2 : 8)}`;
+};
+
+class Request {
+  private options: Options;
+  constructor(options: Options) {
+    this.options = options;
+  }
+  private async request<T = any>(
+    url: string,
+    method: 'GET' | 'POST',
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    const { loading = true, message = true, needLogin = true } = options || {};
+    return new Promise<ResponseData<T>>((resolve, reject) => {
+      if (loading) {
+        uni.showLoading({
+          title: '加载中',
+          mask: true,
+        });
+      }
+      const header: Record<string, string> = {};
+      uni.request({
+        url: `${!/https?/u.test(url) ? this.options.baseURL : ''}${url}${
+          url?.indexOf('?') > 0 ? '&' : '?'
+        }t=${getRandomString(4)}`,
+        method,
+        data: params,
+        header,
+        success(e) {
+          const { data, statusCode } = e;
+          if (loading) {
+            uni.hideLoading();
+          }
+          if (statusCode === 200) {
+            const { success, message: errorMessage } = (data || {}) as any;
+            if (success) {
+              resolve(data as T);
+            } else {
+              if (message) {
+                uni.showToast({
+                  icon: 'none',
+                  title: errorMessage || '系统异常，请重试',
+                });
+              }
+              reject(data);
+            }
+          } else if (statusCode === 401) {
+            if (needLogin) {
+              uni.clearStorageSync();
+            } else {
+              resolve({} as T);
+            }
+          } else {
+            if (message) {
+              if (process.env.NODE_ENV === 'production') {
+                uni.showToast({
+                  icon: 'none',
+                  title: '系统异常，请重试',
+                });
+              } else {
+                uni.showModal({
+                  title: String(statusCode),
+                  content: JSON.stringify(e),
+                  showCancel: false,
+                });
+              }
+            }
+            reject(data);
+          }
+        },
+        fail(e) {
+          if (loading) {
+            uni.hideLoading();
+          }
+          reject(e);
+        },
+      });
+    });
+  }
+  public get<T = any>(
+    url: string,
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    return this.request<T>(url, 'GET', params, options);
+  }
+  public post<T = any>(
+    url: string,
+    params?: Record<string, any>,
+    options?: RequestOptions,
+  ) {
+    return this.request<T>(url, 'POST', params, options);
+  }
+}
+
+export default new Request({ baseURL: REQUEST_HOST });

package/templates/umi-mobile-uni-app/uni-app/common/util.ts

@@ -0,0 +1,27 @@
+import { getRandomString } from './request';
+
+const util = {
+  getRandomString,
+  requestAndroidPermission(permission: string | string[]) {
+    return new Promise<void>((resolve, reject) => {
+      plus.android.requestPermissions(
+        Array.isArray(permission) ? permission : [permission],
+        ({ granted }) => {
+          if (
+            Array.isArray(permission) &&
+            permission.every((item) => granted?.indexOf(item) >= 0)
+          ) {
+            resolve();
+          } else if (granted?.indexOf(permission) >= 0) {
+            resolve();
+          } else {
+            reject();
+          }
+        },
+        reject,
+      );
+    });
+  },
+};
+
+export default util;

package/templates/umi-mobile-uni-app/uni-app/components/webview/webview.vue

@@ -0,0 +1,61 @@
+<style scoped lang="scss">
+</style>
+<template>
+	<web-view v-if="!!src" ref="webview" :style="webviewStyle" :src="src" :update-title="true"
+		:webview-styles="webviewStyles" />
+</template>
+
+<script lang="ts">
+	export default {
+		name: "webview",
+		data() : {
+			webviewStyle ?: string;
+			src ?: string;
+			webviewStyles ?: {
+				progress ?: boolean | {
+					color ?: string;
+				};
+			},
+		} {
+			return {
+				webviewStyle: '',
+				src: '',
+				webviewStyles: {
+					progress: false,
+				},
+			};
+		},
+		props: {
+			url: {
+				type: String,
+				required: true,
+			},
+			data: {
+				type: Object,
+			},
+		},
+		watch: {
+			url: {
+				handler() {
+					this.init();
+				}
+			}
+		},
+		created() {
+			const { url } = this.$props;
+			if (!!url) {
+				this.init();
+			}
+		},
+		beforeDestroy() {
+		},
+		methods: {
+			init() {
+				const { url } = this.$props;
+				if (!!url) {
+					this.src = url;
+				}
+			},
+		},
+	}
+</script>

package/templates/umi-mobile-uni-app/uni-app/hybrid/html/error.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="format-detection" content="telephone=no">
+  <link rel="shortcut icon" href="/favicon.ico">
+  <title>xxx</title>
+  <style>
+    body {
+      margin: 0;
+    }
+    body * {
+      box-sizing: border-box;
+      word-wrap: break-word;
+    }
+  </style>
+</head>
+<body>
+  error
+</body>
+</html>

package/templates/umi-mobile-uni-app/uni-app/images/index.ts

@@ -0,0 +1,2 @@
+export const empty =
+  "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYGBgAAAABQABh6FO1AAAAABJRU5ErkJggg==";

package/templates/umi-mobile-uni-app/uni-app/index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>

package/templates/{ice-mobile-native/ios/HBuilder/HBuilder.entitlements → umi-mobile-uni-app/uni-app/info.plist}

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
-</plist>
+  <dict>
+  </dict>
+</plist>

package/templates/umi-mobile-uni-app/uni-app/main.js

@@ -0,0 +1,22 @@
+import App from './App';
+
+// #ifndef VUE3
+import Vue from 'vue';
+import './uni.promisify.adaptor';
+Vue.config.productionTip = false;
+App.mpType = 'app';
+const app = new Vue({
+  ...App,
+});
+app.$mount();
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue';
+export function createApp() {
+  const app = createSSRApp(App);
+  return {
+    app,
+  };
+}
+// #endif