clxx 2.1.5 → 2.1.7

package/build/utils/dom.js

@@ -1,4 +1,7 @@
-import { createRoot } from 'react-dom/client';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPortalDOM = createPortalDOM;
+const client_1 = require("react-dom/client");
 /**
  *
  * 组件可以通过函数的第一个参数传递进去
@@ -6,14 +9,14 @@ import { createRoot } from 'react-dom/client';
  * @param point HTMLElement 挂载点，如果未指定，则挂载点为body
  * @returns CreatePortalDOMResult
  */
-export function createPortalDOM(point) {
+function createPortalDOM(point) {
     const container = document.createElement('div');
     let mountPoint = document.body;
     if (point instanceof HTMLElement) {
         mountPoint = point;
     }
     mountPoint.appendChild(container);
-    const root = createRoot(container);
+    const root = (0, client_1.createRoot)(container);
     return {
         element: container,
         mount(component) {

package/build/utils/is.js

@@ -1,3 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.is = is;
+exports.clearIsCache = clearIsCache;
 // 缓存 UserAgent，避免重复获取
 const UA = window.navigator.userAgent;
 // 预编译正则表达式，提升性能
@@ -56,7 +60,7 @@ function isIPad() {
  * }
  * ```
  */
-export function is(env) {
+function is(env) {
     // 从缓存中获取结果
     if (cache.has(env)) {
         return cache.get(env);
@@ -106,6 +110,6 @@ export function is(env) {
 /**
  * 清除缓存（用于测试或特殊场景）
  */
-export function clearIsCache() {
+function clearIsCache() {
     cache.clear();
 }

package/build/utils/jsonp.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,13 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.jsonp = jsonp;
 let JSONP_INDEX = 1;
 /**
  * 发送jsonp请求
  * @param url
  * @param callbackName
  */
-export function jsonp(url_1) {
+function jsonp(url_1) {
     return __awaiter(this, arguments, void 0, function* (url, callbackName = 'callback') {
         return new Promise((resolve, reject) => {
             // 生成全局唯一的

package/build/utils/request.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,11 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import isPlainObject from "lodash/isPlainObject";
-import omit from "lodash/omit";
-import isArrayBuffer from "lodash/isArrayBuffer";
-import isTypedArray from "lodash/isTypedArray";
-import { uniqKey } from "./uniqKey";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerHostAlias = registerHostAlias;
+exports.buildUrlByOption = buildUrlByOption;
+exports.parseRequestOption = parseRequestOption;
+exports.sendRequest = sendRequest;
+exports.sugarSend = sugarSend;
+exports.GET = GET;
+exports.POST = POST;
+exports.sendJSON = sendJSON;
+const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
+const omit_1 = __importDefault(require("lodash/omit"));
+const isArrayBuffer_1 = __importDefault(require("lodash/isArrayBuffer"));
+const isTypedArray_1 = __importDefault(require("lodash/isTypedArray"));
+const uniqKey_1 = require("./uniqKey");
 // 用来全局存储host别名映射
 let hostAliasMap = {};
 /**
@@ -19,9 +32,9 @@ let hostAliasMap = {};
  * @param aliasMap
  * @returns
  */
-export function registerHostAlias(aliasMap) {
+function registerHostAlias(aliasMap) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (!isPlainObject(aliasMap))
+        if (!(0, isPlainObject_1.default)(aliasMap))
             return;
         hostAliasMap = Object.assign(Object.assign({}, hostAliasMap), aliasMap);
     });
@@ -30,7 +43,7 @@ export function registerHostAlias(aliasMap) {
  * 通过ajax选项构建Url
  * @param option
  */
-export function buildUrlByOption(option) {
+function buildUrlByOption(option) {
     var _a;
     let config = {
         url: "",
@@ -39,10 +52,10 @@ export function buildUrlByOption(option) {
         disableUrlCache: false,
         transmitPageParam: false,
     };
-    if (isPlainObject(option)) {
+    if ((0, isPlainObject_1.default)(option)) {
         config = Object.assign(Object.assign({}, config), option);
     }
-    if (!isPlainObject(config.data)) {
+    if (!(0, isPlainObject_1.default)(config.data)) {
         config.data = {};
     }
     let url = config.url || "";
@@ -80,7 +93,7 @@ export function buildUrlByOption(option) {
     }
     // 如果是normal请求，将data中的数据作为url的查询字符串
     if (((_a = config.sendType) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === "normal") {
-        if (isPlainObject(config.data)) {
+        if ((0, isPlainObject_1.default)(config.data)) {
             const data = config.data;
             for (let key in data) {
                 urlObject.searchParams.append(key, data[key]);
@@ -95,7 +108,7 @@ export function buildUrlByOption(option) {
     }
     // 如果禁用了URL缓存，添加去缓存参数
     if (config.disableUrlCache) {
-        urlObject.searchParams.append("__c", uniqKey());
+        urlObject.searchParams.append("__c", (0, uniqKey_1.uniqKey)());
     }
     // 返回URL地址
     return urlObject.toString();
@@ -105,7 +118,7 @@ export function buildUrlByOption(option) {
  * @param option
  * @returns
  */
-export function parseRequestOption(option) {
+function parseRequestOption(option) {
     var _a, _b;
     let config = {
         url: "",
@@ -118,7 +131,7 @@ export function parseRequestOption(option) {
     config.sendType = config.sendType.toLowerCase();
     config.method = (_a = config.method) === null || _a === void 0 ? void 0 : _a.toUpperCase();
     // 传递过来的参数覆盖默认值
-    if (isPlainObject(option)) {
+    if ((0, isPlainObject_1.default)(option)) {
         config = Object.assign(Object.assign({}, config), option);
     }
     /**
@@ -145,7 +158,7 @@ export function parseRequestOption(option) {
             }
             break;
         case "form":
-            if (isPlainObject(config.data)) {
+            if ((0, isPlainObject_1.default)(config.data)) {
                 const body = new FormData();
                 const data = config.data;
                 for (let key in data) {
@@ -158,7 +171,7 @@ export function parseRequestOption(option) {
             }
             break;
         case "json":
-            if (isPlainObject(config.data)) {
+            if ((0, isPlainObject_1.default)(config.data)) {
                 config.headers["Content-Type"] = "application/json";
                 config.body = JSON.stringify(config.data);
             }
@@ -169,7 +182,7 @@ export function parseRequestOption(option) {
             }
             break;
         case "params":
-            if (isPlainObject(config.data)) {
+            if ((0, isPlainObject_1.default)(config.data)) {
                 const body = new URLSearchParams();
                 const data = config.data;
                 for (let key in data) {
@@ -182,8 +195,8 @@ export function parseRequestOption(option) {
             }
             break;
         case "buffer":
-            if (isArrayBuffer(config.data) ||
-                isTypedArray(config.data) ||
+            if ((0, isArrayBuffer_1.default)(config.data) ||
+                (0, isTypedArray_1.default)(config.data) ||
                 config.data instanceof DataView) {
                 config.body = config.data;
             }
@@ -191,7 +204,7 @@ export function parseRequestOption(option) {
         default:
             break;
     }
-    const fetchOption = omit(config, [
+    const fetchOption = (0, omit_1.default)(config, [
         "url",
         "sendType",
         "data",
@@ -206,7 +219,7 @@ export function parseRequestOption(option) {
  * @param url
  * @param option
  */
-export function sendRequest(option) {
+function sendRequest(option) {
     return __awaiter(this, void 0, void 0, function* () {
         const { url, fetchOption, timeout } = parseRequestOption(option);
         const controller = new AbortController();
@@ -246,15 +259,15 @@ export function sendRequest(option) {
  * @param option
  * @returns
  */
-export function sugarSend(sendType, url, data, option) {
+function sugarSend(sendType, url, data, option) {
     return __awaiter(this, void 0, void 0, function* () {
         let config = {
             url,
             data,
             sendType,
         };
-        if (isPlainObject(option)) {
-            config = Object.assign(Object.assign({}, config), omit(option, ["url", "data", "sendType"]));
+        if ((0, isPlainObject_1.default)(option)) {
+            config = Object.assign(Object.assign({}, config), (0, omit_1.default)(option, ["url", "data", "sendType"]));
         }
         return sendRequest(config);
     });
@@ -266,7 +279,7 @@ export function sugarSend(sendType, url, data, option) {
  * @param option
  * @returns
  */
-export function GET(url, data, option) {
+function GET(url, data, option) {
     return __awaiter(this, void 0, void 0, function* () {
         return sugarSend("normal", url, data, option);
     });
@@ -278,7 +291,7 @@ export function GET(url, data, option) {
  * @param option
  * @returns
  */
-export function POST(url, data, option) {
+function POST(url, data, option) {
     return __awaiter(this, void 0, void 0, function* () {
         return sugarSend("form", url, data, option);
     });
@@ -290,7 +303,7 @@ export function POST(url, data, option) {
  * @param option
  * @returns
  */
-export function sendJSON(url, data, option) {
+function sendJSON(url, data, option) {
     return __awaiter(this, void 0, void 0, function* () {
         return sugarSend("json", url, data, option);
     });

package/build/utils/tick.js

@@ -1,9 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tick = tick;
 /**
  * 逐帧执行的工具函数，返回一个方法，调用该方法，停止执行
  * @param callback
  * @param interval
  */
-export function tick(callback, interval) {
+function tick(callback, interval) {
     let isRunning;
     let frame;
     let frameId;

package/build/utils/uniqKey.js

@@ -1,10 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uniqKey = uniqKey;
 let keyIndex = 0;
 let lastTimestamp = 0;
 /**
  * 生成一个全局唯一的key
  * @returns
  */
-export function uniqKey() {
+function uniqKey() {
     const now = Date.now();
     // 时间戳变化时重置计数器
     if (now !== lastTimestamp) {

package/build/utils/wait.js

@@ -1,3 +1,4 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -7,7 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { tick } from './tick';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitUntil = waitUntil;
+exports.waitFor = waitFor;
+const tick_1 = require("./tick");
 /**
  * 直接条件为真或者超时才返回结果
  *
@@ -16,7 +20,7 @@ import { tick } from './tick';
  *
  * @returns 返回检测的结果，超时返回false
  */
-export function waitUntil(condition, maxTime) {
+function waitUntil(condition, maxTime) {
     return __awaiter(this, void 0, void 0, function* () {
         // 记录检测开始时间
         const start = Date.now();
@@ -29,7 +33,7 @@ export function waitUntil(condition, maxTime) {
             maxTime = Infinity;
         }
         return new Promise((resolve) => {
-            const stop = tick(() => {
+            const stop = (0, tick_1.tick)(() => {
                 const now = Date.now();
                 // 超时返回false
                 if (now - start >= maxTime) {
@@ -60,7 +64,7 @@ export function waitUntil(condition, maxTime) {
  * 等待固定时间，期间一直阻塞
  * @param duration 等待时长(毫秒)
  */
-export function waitFor(duration) {
+function waitFor(duration) {
     return __awaiter(this, void 0, void 0, function* () {
         return new Promise((resolve) => {
             window.setTimeout(resolve, duration);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clxx",
-  "version": "2.1.5",
+  "version": "2.1.7",
   "description": "Basic JS library for mobile devices",
   "main": "./build/index.js",
   "module": "./build/index.js",

package/test/src/city-select/index.jsx

@@ -0,0 +1,21 @@
+import { showCitySelect } from "@";
+import { useEffect } from "react";
+
+export default function Index() {
+  return (
+    <button
+      onClick={() => {
+        showCitySelect({
+          onSelect: (city) => {
+            console.log("选择了城市：", city);
+          },
+          getLocation() {
+            return "北京";
+          },
+        });
+      }}
+    >
+      选择城市
+    </button>
+  );
+}

package/test/src/dialog/index.module.css

@@ -1,5 +1,5 @@
 .contentBox {
-  width: 7.5rem * 0.8;
+  width: calc(7.5rem * 0.8);
   height: 4rem;
   background: goldenrod;
 }

package/test/src/index/index.jsx

@@ -16,6 +16,7 @@ const pageConfig = [
   { path: "clickable", title: "Clickable可触摸组件", enable: true },
   // { path: 'privacy', title: 'Privacy去标识化', enable: true },
   { path: "autogrid", title: "AutoGrid生成自动对齐的表格", enable: true },
+  { path: "city-select", title: "CitySelect城市选择器", enable: true },
 ];
 
 export default function Index() {

package/test/vite.config.js

@@ -4,10 +4,14 @@ import path from "path";
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react()],
+  plugins: [
+    react({
+      jsxImportSource: "@emotion/react",
+    }),
+  ],
   resolve: {
     alias: {
-      "@": path.resolve(__dirname, "../build/index"),
+      "@": path.resolve(__dirname, "../src/index.ts"),
       react: path.resolve(__dirname, "node_modules/react"),
       "react-dom": path.resolve(__dirname, "node_modules/react-dom"),
     },

package/build/context.d.ts

@@ -1,15 +0,0 @@
-export interface ContextValue {
-    maxDocWidth: number;
-    minDocWidth: number;
-}
-/**
- * 设置环境变量的值
- * @param envValue
- */
-export declare function setContextValue(value: Partial<ContextValue>): void;
-/**
- * 获取环境变量值
- * @param key
- * @returns
- */
-export declare function getContextValue(key?: keyof ContextValue): number | ContextValue;

package/build/context.js

@@ -1,24 +0,0 @@
-let context = {
-    maxDocWidth: 576,
-    minDocWidth: 312,
-};
-/**
- * 设置环境变量的值
- * @param envValue
- */
-export function setContextValue(value) {
-    if (typeof context === "object") {
-        context = Object.assign(Object.assign({}, context), value);
-    }
-}
-/**
- * 获取环境变量值
- * @param key
- * @returns
- */
-export function getContextValue(key) {
-    if (key && typeof key === "string") {
-        return context[key];
-    }
-    return context;
-}