Publish

- @gemjs/[email protected] - [email protected] - @mantou/[email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected]
mantou132 · Jan 22, 2024 · f161fb8 · f161fb8
1 parent 28c5de9
commit f161fb8
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 55 deletions.
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
   "name": "@gemjs/config",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "Gemjs common config"
 }
diff --git a/packages/duoyun-ui/docs/zh/30-blog/200-crud.md b/packages/duoyun-ui/docs/zh/30-blog/200-crud.md
@@ -200,8 +200,8 @@ import { locationStore } from 'duoyun-ui/react/DyPatConsole';
 import DyPatTable from 'duoyun-ui/react/DyPatTable';
 
 export function Item() {
-  const [i, update] = useState(0);
-  useEffect(() => connect(locationStore, () => update(i + 1)), []);
+  const [_, update] = useState({});
+  useEffect(() => connect(locationStore, () => update({})), []);
   return <DyPatTable></DyPatTable>;
 }
 ```
@@ -257,7 +257,7 @@ import 'duoyun-ui/patterns/table';
 export class ConsolePageItemElement extends GemElement {
   state = {};
 
-  #columns: FilterableColumn[] = [
+  #columns: FilterableColumn<any>[] = [
     {
       title: 'No',
       dataIndex: 'id',
@@ -282,21 +282,22 @@ export class ConsolePageItemElement extends GemElement {
 ```
 
 ```tsx React
+import { useState, useEffect } from 'react';
 import { connect } from '@mantou/gem';
 import { get } from '@mantou/gem/helper/request';
 import { locationStore } from 'duoyun-ui/patterns/console';
-import { DyPatTable, FilterableColumn } from 'duoyun-ui/patterns/table';
+import DyPatTable, { FilterableColumn } from 'duoyun-ui/react/DyPatTable';
 
 export function Item() {
-  const [i, update] = useState(0);
-  useEffect(() => connect(locationStore, () => update(i + 1)), []);
+  const [_, update] = useState({});
+  useEffect(() => connect(locationStore, () => update({})), []);
 
   const [data, updateData] = useState();
   useEffect(() => {
     get(`https://jsonplaceholder.typicode.com/users`).then(updateData);
   }, []);
 
-  const columns: FilterableColumn[] = [
+  const columns: FilterableColumn<any>[] = [
     {
       title: 'No',
       dataIndex: 'id',
@@ -318,7 +319,7 @@ export function Item() {
 ```ts
 import { ContextMenu } from 'duoyun-ui/elements/contextmenu';
 
-const columns: FilterableColumn[] = [
+const columns: FilterableColumn<any>[] = [
   // ...
   {
     title: '',
@@ -352,7 +353,7 @@ const columns: FilterableColumn[] = [
 ```ts
 import type { FormItem } from 'duoyun-ui/patterns/form';
 
-const formItems: FormItem[] = [
+const formItems: FormItem<any>[] = [
   {
     type: 'text',
     field: 'username',
@@ -458,8 +459,8 @@ html`
 
 ```ts
 import { Time } from 'duoyun-ui/lib/time';
-import { PaginationReq, createPaginationStore } from 'duoyun-ui/helper/store';
-import type { ChangeEventDetail } from 'duoyun-ui/patterns/table';
+import { createPaginationStore } from 'duoyun-ui/helper/store';
+import type { FetchEventDetail } from 'duoyun-ui/patterns/table';
 
 const { store, updatePage } = createPaginationStore({
   storageKey: 'users',
@@ -468,7 +469,7 @@ const { store, updatePage } = createPaginationStore({
 });
 
 // 模拟真实 API
-const fetchList = (args: PaginationReq) => {
+const fetchList = (args: FetchEventDetail) => {
   return get(`https://jsonplaceholder.typicode.com/users`).then((list) => {
     list.forEach((e, i) => {
       e.updated = new Time().subtract(i + 1, 'd').getTime();
@@ -478,7 +479,7 @@ const fetchList = (args: PaginationReq) => {
   });
 };
 
-const onFetch = ({ detail }: CustomEvent<ChangeEventDetail>) => {
+const onFetch = ({ detail }: CustomEvent<FetchEventDetail>) => {
   updatePage(fetchList, detail);
 };
 ```

diff --git a/packages/duoyun-ui/package.json b/packages/duoyun-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "duoyun-ui",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "A lightweight desktop UI component library, implemented using Gem",
   "keywords": [
     "frontend",
@@ -56,7 +56,7 @@
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "@open-wc/testing": "^2.5.33",
     "@types/d3-geo": "^3.0.1",
     "@web/dev-server-esbuild": "^0.2.16",

diff --git a/packages/duoyun-ui/src/helper/store.ts b/packages/duoyun-ui/src/helper/store.ts
@@ -1,6 +1,6 @@
 import { UseCacheStoreOptions, useCacheStore } from '../lib/utils';
 
-export type PaginationReq = {
+type PaginationReq = {
   page: number;
   size: number;
 };
@@ -63,19 +63,22 @@ export function createPaginationStore<T extends Record<string, any>>(options: Pa
     update();
   };
 
-  const updatePage = async (request: (args: PaginationReq) => Promise<PaginationRes<any>>, args: PaginationReq) => {
-    changePage(args.page, { loading: true });
+  const updatePage = async <Req extends PaginationReq>(
+    request: (req: Req) => Promise<PaginationRes<any>>,
+    req: Req,
+  ) => {
+    changePage(req.page, { loading: true });
     try {
-      const result = await request(args);
-      changePage(args.page, { ids: result.list.map((e) => e[idKey]) });
+      const result = await request(req);
+      changePage(req.page, { ids: result.list.map((e) => e[idKey]) });
 
       if (pageContainItem) {
         result.list.forEach((e) => (store.items[e[idKey]] = e));
       }
 
-      update({ total: 'total' in result ? result.total : Math.ceil(result.count / args.size) });
+      update({ total: 'total' in result ? result.total : Math.ceil(result.count / req.size) });
     } finally {
-      changePage(args.page, { loading: false });
+      changePage(req.page, { loading: false });
     }
   };
 

diff --git a/packages/gem-analyzer/package.json b/packages/gem-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gem-analyzer",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "gem analyzer",
   "main": "index.js",
   "files": [
@@ -13,10 +13,10 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@mantou/gem": "^1.7.10"
+    "@mantou/gem": "^1.7.11"
   },
   "devDependencies": {
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "ts-morph": "^13.0.0",
     "typescript": "^5.3.2"
   },

diff --git a/packages/gem-book/package.json b/packages/gem-book/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gem-book",
-  "version": "1.5.36",
+  "version": "1.5.37",
   "description": "Create your document website easily and quickly",
   "keywords": [
     "doc",
@@ -39,7 +39,7 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@mantou/gem": "^1.7.10",
+    "@mantou/gem": "^1.7.11",
     "anymatch": "^3.1.3",
     "chalk": "^2.4.2",
     "cheerio": "^1.0.0-rc.12",
@@ -67,7 +67,7 @@
   "devDependencies": {
     "@codesandbox/sandpack-client": "^2.0.01",
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "@open-wc/testing": "^2.5.33",
     "@types/jsdom": "^16.2.10",
     "@types/marked": "^2.0.2",
@@ -77,7 +77,7 @@
     "@web/dev-server-esbuild": "^0.2.16",
     "@web/test-runner": "^0.13.22",
     "esbuild": "^0.14.14",
-    "gem-analyzer": "^1.7.7",
+    "gem-analyzer": "^1.7.8",
     "nodemon": "^2.0.7",
     "ts-morph": "^13.0.0",
     "webpack-cli": "^5.1.4",

diff --git a/packages/gem-devtools/package.json b/packages/gem-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gem-devtools",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Gem devtools",
   "scripts": {
     "update:version": "node ./scripts/update.js",
@@ -11,11 +11,11 @@
     "start": "yarn build && concurrently -k npm:watch npm:browser"
   },
   "dependencies": {
-    "@mantou/gem": "^1.7.10",
+    "@mantou/gem": "^1.7.11",
     "webextension-polyfill": "^0.10.0"
   },
   "devDependencies": {
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "@types/webextension-polyfill": "^0.10.7",
     "vite": "^4.5.2",
     "web-ext": "^7.8.0"

diff --git a/packages/gem-examples/package.json b/packages/gem-examples/package.json
@@ -1,18 +1,18 @@
 {
   "private": true,
   "name": "gem-examples",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "gem examples",
   "scripts": {
     "build": "vite build",
     "start": "vite serve"
   },
   "dependencies": {
-    "@mantou/gem": "^1.7.10",
-    "duoyun-ui": "^1.1.10"
+    "@mantou/gem": "^1.7.11",
+    "duoyun-ui": "^1.1.11"
   },
   "devDependencies": {
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "vite": "^4.5.2",
     "vite-plugin-virtual-mpa": "^1.9.3"
   }

diff --git a/packages/gem-examples/src/console/item.ts b/packages/gem-examples/src/console/item.ts
@@ -6,7 +6,7 @@ import { Time } from 'duoyun-ui/lib/time';
 import { ContextMenu } from 'duoyun-ui/elements/contextmenu';
 import { FormItem, createForm } from 'duoyun-ui/patterns/form';
 import { sleep } from 'duoyun-ui/lib/utils';
-import { PaginationReq, createPaginationStore } from 'duoyun-ui/helper/store';
+import { createPaginationStore } from 'duoyun-ui/helper/store';
 import type { FetchEventDetail, FilterableColumn } from 'duoyun-ui/patterns/table';
 
 import 'duoyun-ui/patterns/table';
@@ -204,7 +204,7 @@ export class ConsolePageItemElement extends GemElement {
     });
   };
 
-  #fetchList = (args: PaginationReq) => {
+  #fetchList = (args: FetchEventDetail) => {
     return get(`https://jsonplaceholder.typicode.com/users`).then((list: Item[]) => {
       list.forEach((e, i) => {
         e.updated = new Time().subtract(i + 1, 'd').getTime();

diff --git a/packages/gem-port/package.json b/packages/gem-port/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gem-port",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Export React component",
   "keywords": [
     "gem",
@@ -19,9 +19,9 @@
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "commander": "^7.2.0",
-    "gem-analyzer": "^1.7.7",
+    "gem-analyzer": "^1.7.8",
     "ts-morph": "^13.0.0",
     "typescript": "^4.5.0"
   },

diff --git a/packages/gem-port/src/react.ts b/packages/gem-port/src/react.ts
@@ -70,17 +70,6 @@ function createReactSourceFile(elementFilePath: string, outDir: string) {
               };
             }, []);
             
-            // React Bug
-            const [mounted, update] = useState(false);
-            useEffect(() => update(true), []);
-            if (!mounted) {
-              return <${tag}
-                    ${properties
-                      .map(({ attribute, name }) => (attribute ? `${attribute}={props.${name}}` : ''))
-                      .join(' ')}
-                    ></${tag}>;
-            }
-            
             return <${tag} ref={elementRef} {...props}></${tag}>;
           })
 

diff --git a/packages/gem/package.json b/packages/gem/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mantou/gem",
-  "version": "1.7.10",
+  "version": "1.7.11",
   "description": "💎 使用自定义元素的轻量级 WebApp 开发框架",
   "keywords": [
     "frontend",
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4-fix.0",
-    "@gemjs/config": "^1.6.12",
+    "@gemjs/config": "^1.6.13",
     "@open-wc/testing": "^2.5.33",
     "@web/dev-server-esbuild": "^0.2.16",
     "@web/test-runner": "^0.13.22",