@quansitech/antd-admin 1.0.1 → 1.1.0

package/components/Column/Readonly/Action.tsx

@@ -5,7 +5,7 @@ import {Badge, Flex} from "antd";
 import {ColumnReadonlyProps} from "./types";
 import {asyncFilter, handleRules} from "../../../lib/helpers";
 import {Rules} from "@rc-component/async-validator/lib/interface";
-import upperFirst from "lodash/upperFirst";
+import {upperFirst} from "lodash";
 import {TableColumnActionProps} from "./Action/types";
 
 type ComponentType = {

package/components/Column/Ueditor.tsx

@@ -3,7 +3,7 @@ import {Component} from "react";
 import {createScript, filterObjectKeys} from "../../lib/helpers";
 import {Spin} from "antd";
 import {ModalContext, ModalContextProps} from "../ModalContext";
-import uniqueId from "lodash/uniqueId";
+import {uniqueId} from "lodash";
 
 declare global {
     interface Window {

package/components/Form/Actions.tsx

@@ -3,7 +3,7 @@ import {lazy, useEffect, useState} from "react";
 import {ReactComponentLike} from "prop-types";
 import {Badge, Space} from "antd";
 import container from "../../lib/container";
-import upperFirst from "lodash/upperFirst";
+import {upperFirst} from "lodash";
 
 export default function (props: {
     actions?: FormActionType[]

package/components/Form.tsx

@@ -1,19 +1,18 @@
 import {BetaSchemaForm, ProFormColumnsType, ProFormInstance, ProSkeleton} from "@ant-design/pro-components";
 import type {FormSchema} from "@ant-design/pro-form/es/components/SchemaForm/typing";
 import React, {lazy, Suspense, useContext, useEffect, useRef, useState} from "react";
-import upperFirst from "lodash/upperFirst";
+import {cloneDeep, upperFirst} from "lodash";
 import container from "../lib/container";
 import {FormActionType} from "./Form/Action/types";
 import Actions from "./Form/Actions";
 import {FormContext} from "./FormContext";
 import {Col, Row, Spin} from "antd";
 import http from "../lib/http";
-import {RuleObject} from "rc-field-form/lib/interface";
 import customRule from "../lib/customRule";
-import cloneDeep from "lodash/cloneDeep";
 import {ModalContext} from "./ModalContext";
 import {TableContext} from "./TableContext";
 import {commonHandler} from "../lib/schemaHandler";
+import {Rule} from "antd/es/form";
 
 type SubmitRequestType = {
     url: string,
@@ -42,7 +41,7 @@ export default function (props: FormSchema & {
     useEffect(() => {
         setColumns((cloneDeep(props.columns)?.map((c: ProFormColumnsType & {
             formItemProps?: {
-                rules?: (RuleObject & {
+                rules?: (Rule & {
                     customType?: string
                 })[]
             }
@@ -55,10 +54,8 @@ export default function (props: FormSchema & {
                 c.formItemProps.rules = []
             }
             c.formItemProps.rules = c.formItemProps.rules.map(rule => {
-                if (rule.customType) {
-                    if (customRule[rule.customType]) {
-                        rule.validator = customRule[rule.customType]
-                    }
+                if (rule.customType && customRule[rule.customType]) {
+                    rule.validator = customRule[rule.customType]
                 }
                 return rule
             })

package/components/Layout/New.tsx

@@ -9,7 +9,7 @@ import {MenuInfo} from "rc-menu/lib/interface";
 import http from "../../lib/http";
 // @ts-ignore
 import {Route} from '@ant-design/pro-layout/lib/typing';
-import assign from "lodash/assign";
+import {assign} from "lodash";
 import {MoonOutlined, SunOutlined} from "@ant-design/icons";
 
 export default function ({children, pageTitle, siteTitle}: {

package/components/Table/ToolbarActions.tsx

@@ -3,7 +3,7 @@ import container from "../../lib/container";
 import {ReactComponentLike} from "prop-types";
 import {Badge, Space} from "antd";
 import {TableActionProps} from "./Action/types";
-import upperFirst from "lodash/upperFirst";
+import {upperFirst} from "lodash";
 
 export default function ({
                              actions,

package/components/Table.tsx

@@ -9,8 +9,7 @@ import {
 } from "@ant-design/pro-components";
 import type {SortOrder} from "antd/lib/table/interface";
 import {TablePaginationConfig} from "antd/es/table";
-import isArray from "lodash/isArray"
-import upperFirst from "lodash/upperFirst"
+import {cloneDeep, isArray, uniqueId, upperFirst} from "lodash"
 import {TableContext} from "./TableContext";
 import ToolbarActions from "./Table/ToolbarActions";
 import container from "../lib/container";
@@ -19,8 +18,6 @@ import http from "../lib/http";
 import {Spin} from "antd";
 import "./Table.scss"
 import {ModalContext} from "./ModalContext";
-import cloneDeep from "lodash/cloneDeep";
-import uniqueId from "lodash/uniqueId";
 import {commonHandler} from "../lib/schemaHandler";
 
 export type TableProps = ProTableProps<any, any> & {

package/components/Tabs.tsx

@@ -3,7 +3,7 @@ import {lazy, Suspense, useEffect, useState} from "react";
 import type {Tab} from 'rc-tabs/lib/interface';
 import container from "../lib/container";
 import {routerNavigateTo} from "../lib/helpers";
-import upperFirst from "lodash/upperFirst";
+import {upperFirst} from "lodash";
 import {ProSkeleton} from "@ant-design/pro-components";
 
 type TabProps = {

package/lib/helpers.tsx

@@ -5,7 +5,7 @@ import {Rules, ValidateError, ValidateFieldsError, Values} from "@rc-component/a
 import {Spin} from "antd";
 import http from "./http";
 import container from "./container";
-import upperFirst from "lodash/upperFirst";
+import {upperFirst} from "lodash";
 import {lazy, Suspense} from "react";
 import global from "./global";
 import {ModalContext} from "../components/ModalContext";

package/lib/writeExtra.js

@@ -0,0 +1,31 @@
+import fs from "node:fs"
+import path from "node:path"
+import * as process from "node:process";
+
+export default function () {
+    // 分析额外组件
+    if (!fs.existsSync(process.cwd() + '/vendor')) {
+        throw new Error('Please run `composer install` first.');
+    }
+
+    const installed = JSON.parse(fs.readFileSync(process.cwd() + '/vendor/composer/installed.json'))
+    const extras = installed.packages.filter(p => !!p.extra?.qscmf?.['antd-admin']).map(p => ({
+        name: p.name,
+        path: p['install-path'],
+        component: p.extra.qscmf['antd-admin'].component,
+    }));
+
+    const extra_script = `
+import container from "@quansitech/antd-admin/lib/container.ts";
+
+${extras.map(e => {
+        const cs = [];
+        for (const componentKey in e.component) {
+            cs.push(`container.register('${componentKey}', () => import('../../../vendor${path.join('/', e.path, e.component[componentKey])}'));`)
+        }
+        return cs.join('\n');
+    })}
+`
+
+    fs.writeFileSync(process.cwd() + '/resources/js/backend/extra.ts', extra_script);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "files": [
     "components",

package/readme.md

@@ -126,3 +126,26 @@ container.register('Column.Readonly.Action.组件名', () => import('[组件路
 
 - 若要补充组件库，请把组件放``` compontents/Column/Readonly/Action/ ``` 目录下
 
+## 更新日志
+
+### 1.1.0
+
+#### 1.增加composer包注册组件机制
+
+在包的composer.json中添加如下配置
+
+```json5
+{
+    // 省略其它配置
+    "extra": {
+        "qscmf": {
+            "antd-admin": {
+                "component": {
+                    "【container注册位置】": "【目标组件路径】",
+                    "Column.Extra": "resourses/js/Component/Extra.tsx"
+                }
+            }
+        }
+  }
+}
+```