~

1 year ago · cdc2ad6101
12 changed files with 171 additions and 7186 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -0,0 +1,4 @@
+node_modules
+buildConfig
+.vscode
+.github
--- a/.eslintrc
+++ b/.eslintrc
@ -0,0 +1,28 @@
+{
+	"root": true,
+	"env": {
+		"browser": true,
+		"commonjs": true,
+		"es6": true,
+		"node": true,
+		"jest": true
+	},
+	"parser": "@typescript-eslint/parser",
+	"extends": ["prettier", "plugin:@typescript-eslint/recommended"],
+	"parserOptions": {
+		"ecmaFeatures": {
+			"experimentalObjectRestSpread": true,
+			"jsx": true
+		},
+		"sourceType": "module"
+	},
+	"plugins": ["@typescript-eslint/eslint-plugin"],
+	"rules": {
+		"@typescript-eslint/no-unused-vars": 0,
+		"react/display-name": 0,
+		"react/prop-types": 0,
+		"@typescript-eslint/adjacent-overload-signatures": 0,
+		"@typescript-eslint/ban-types": 0,
+		"@typescript-eslint/no-empty-interface": 0
+	}
+}
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,4 @@ build
 regex.md
 index.dts
 *.code-workspace
-
+pnpm-lock.yaml
--- a/.prettierrc
+++ b/.prettierrc
@ -0,0 +1,10 @@
+{
+	"printWidth": 140,
+	"semi": true,
+	"useTabs": true,
+	"tabWidth": 4,
+	"arrowParens": "always",
+	"singleQuote": true,
+	"trailingComma": "none",
+	"endOfLine": "auto"
+}
--- a/buildConfig/webpack.config.js
+++ b/buildConfig/webpack.config.js
@ -1,14 +1,3 @@
-/*
- * @Author: BATU1579
- * @CreateDate: 2022-05-24 16:55:58
- * @LastEditor: BATU1579
- * @LastTime: 2022-09-06 14:30:21
- * @FilePath: \\buildConfig\\webpack.config.js
- * @Description: 默认设置
- * 
- * https://blog.csdn.net/Zong_0915/article/details/115831373
- */
-const path = require('path')
 const { CleanWebpackPlugin } = require('clean-webpack-plugin')

 module.exports = {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,34 +1,38 @@
 {
-    "name": "dpa-andriod-starter",
-    "version": "2.5.3",
-    "description": "一个用来快速开始编写 dpa-andriod 脚本的模板",
-    "main": "index.js",
-    "scripts": {
-        "build": "webpack --config ./buildConfig/webpack.dev.js"
-    },
-    "keywords": [
-        "dpa-andriod",
-        "autojs"
-    ],
-    "author": "batu1579",
-    "license": "MPL-2.0",
-    "devDependencies": {
-        "@babel/core": "^7.18.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
-        "@babel/plugin-transform-runtime": "^7.18.10",
-        "@babel/preset-env": "^7.18.10",
-        "babel-loader": "^8.2.5",
-        "clean-webpack-plugin": "^4.0.0",
-        "core-js": "^3.22.6",
-        "ts-loader": "^9.3.0",
-        "typescript": "^4.6.4",
-        "webpack": "^5.72.1",
-        "webpack-cli": "^4.9.2",
-        "webpack-merge": "^5.8.0"
-    },
-    "dependencies": {
-        "@babel/preset-react": "^7.18.6",
-        "@babel/runtime": "^7.18.9",
-        "babel-preset-mobx": "^2.0.0"
-    }
+	"name": "dpa-andriod-starter",
+	"version": "1.0.0",
+	"description": "一个用来快速开始编写 dpa-andriod 脚本的模板",
+	"main": "index.js",
+	"scripts": {
+		"build": "webpack --config ./buildConfig/webpack.dev.js"
+	},
+	"keywords": [
+		"dpa-andriod",
+		"autojs"
+	],
+	"devDependencies": {
+		"@babel/core": "^7.18.0",
+		"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+		"@babel/plugin-transform-runtime": "^7.18.10",
+		"@babel/preset-env": "^7.18.10",
+		"@typescript-eslint/eslint-plugin": "^5.4.0",
+		"@typescript-eslint/parser": "^5.4.0",
+		"babel-loader": "^8.2.5",
+		"clean-webpack-plugin": "^4.0.0",
+		"core-js": "^3.22.6",
+		"eslint": "8",
+		"eslint-config-prettier": "^8.3.0",
+		"eslint-plugin-prettier": "^4.0.0",
+		"prettier": "^2.4.1",
+		"ts-loader": "^9.3.0",
+		"typescript": "^4.6.4",
+		"webpack": "^5.72.1",
+		"webpack-cli": "^4.9.2",
+		"webpack-merge": "^5.8.0"
+	},
+	"dependencies": {
+		"@babel/preset-react": "^7.18.6",
+		"@babel/runtime": "^7.18.9",
+		"babel-preset-mobx": "^2.0.0"
+	}
 }
--- a/src/base.ts
+++ b/src/base.ts
@ -0,0 +1,15 @@
+import { Events } from 'events';
+
+export class DPBase extends Events {
+	constructor() {
+		super();
+	}
+
+	init() {
+		console.log('init');
+	}
+
+	start() {
+		console.log('start');
+	}
+}
--- a/src/index.ts
+++ b/src/index.ts
@ -1 +1,9 @@
-id('res').bounds(0, 0, 100, 100).visibleToUser()
+import { DPBase } from './base';
+
+class Hongguo extends DPBase {
+	constructor() {
+		super();
+	}
+}
+
+const hongguo = new Hongguo().start();
--- a/types/console.d.ts
+++ b/types/console.d.ts
@ -13,7 +13,7 @@ declare module 'console' {
        /**
         * @description: 控制台模块提供了一个和 Web 浏览器中相似的用于调试的控制台。用于输出一些调试信息、中间结果等。 console 模块中的一些函数也可以直接作为全局函数使用，例如 `log` , `print` 等。
         */
-        var console: Console
+        const console: Console

        interface Console {
            /**
--- a/types/dpa.ts
+++ b/types/dpa.ts
@ -30,21 +30,83 @@ declare module "dpa" {
     * @param {string} action 流程输出参数 默认为 input
     * @example
     * ```typescript
-     * dpa.getOutParam('输出内容');
+     * dpa.setOutParam('输出内容');
     * ```
     */
    setOutParam(content: any, action?: string): void;

    /**
     * @description: 数据表操作
-     * @param {+} content 流程输出内容
-     * @param {string} action 流程输出参数 默认为 input
+     * @param {string} type "find" | "select" | "delete"
+     * @param {string} content where查询条件
+     * @example
+     * ```typescript
+     *  dpa.optDataTable("find", { name: '名字', age: 18 });
+     * ```
+     */
+    optDataTable(
+      type: "find" | "select" | "delete",
+      content?: Record<string, string | number>
+    ): void;
+
+    /**
+     * @description: 数据表操作添加单条数据
+     * @param {string} type add
+     * @param {string} content 数据对象
+     * @example
+     * ```typescript
+     *  dpa.optDataTable("add", { name: '名字', age: 18 });
+     * ```
+     */
+    optDataTable(type: "add", content?: Record<string, string | number>): void;
+
+    /**
+     * @description: 数据表操作 添加多条数据
+     * @param {string} type add
+     * @param {string} content 数据对象数组
+     * @example
+     * ```typescript
+     *  dpa.optDataTable("add", [{ name: '名字1', age: 18 }, { name: '名字2', age: 19 }]);
+     * ```
+     */
+    optDataTable(
+      type: "add",
+      content?: Record<string, string | number>[]
+    ): void;
+
+    /**
+     * @description: 数据表操作 更新数据
+     * @param {string} type "find" | "select" | "delete"
+     * @param {string} content where查询条件, data更新数据
+     * @example
+     * ```typescript
+     *  dpa.optDataTable("find", { name: '名字', age: 18 });
+     * ```
+     */
+    optDataTable(
+      type: "update",
+      content?: {
+        where: Record<string, string | number>;
+        data: Record<string, string | number>;
+      }
+    ): void;
+
+    /**
+     * @description: 数据表操作 条件更新 当 where 条件未命中到任何数据时添加数据，命中数据则更新该数据。
+     * @param {string} type "thenUpdate"
+     * @param {string} content where查询条件, data更新数据
     * @example
     * ```typescript
-     * dpa.getOutParam('输出内容');
+     *  dpa.optDataTable("find", { name: '名字', age: 18 });
     * ```
     */
-    optDataTable(type, action?: string): void;
+    optDataTable(
+      type: "thenUpdate",
+      content?: {
+        where: Record<string, string | number>;
+        data: Record<string, string | number>;
+      }
+    ): void;
  }

  interface DPAEnv {
--- a/types/widget-operation.d.ts
+++ b/types/widget-operation.d.ts
@ -1132,7 +1132,6 @@ declare module 'widget-operation' {
             * let clickableNames = names.find(clickable());
             * ```
             */
-            // @ts-ignore
            find(selector: UiSelector): UiCollection;

            /**