表单枚举类优化

README.md

@@ -1 +1,80 @@
 # 表单创建与验证工具
+## 使用方法
+### step1 安装库
+> 该方法为直接在项目中通过配置链接的方式引入该库
+
+1. 编辑 `package.josn`
+2. 在依赖 `dependencies` 中添加如下内容  
+
+"kind-form-verify": "git+http://kindring.cn:9123/kindring/FormData.git"
+
+`package.json` 示例:
+```json
+{
+  "dependencies": {
+    "kind-form-verify": "git+http://kindring.cn:9123/kindring/FormData.git"
+  }
+}
+```
+
+3. 执行 `npm install` 安装依赖
+4. 更新库  
+使用 npm  
+`npm update kind-form-verify`  
+使用 yarn  
+`yarn upgrade kind-form-verify`
+
+### step2 引入库
+```js
+import { FieldCheck, FormVerify } from 'kind-form-verify';
+```
+
+### step3 使用库
+```js
+let fieldCheck = new FieldCheck();
+fieldCheck.addRuleItem('rule1',['name'],[
+    {
+    type: 'string',
+    minLength: 2,
+    maxLength: 10,
+    message: '姓名必须为2-10个字符'
+    }
+    ]);
+fieldCheck.addRuleItem('rule2',['age'],[
+    {
+    type: 'number',
+    min: 18,
+    max: 100,
+    message: '年龄必须为18-100岁'
+    }]);
+let errMsg = fieldCheck.verify({
+    name: 'kindring',
+    age: 18});
+console.log(errMsg);
+
+let form = {
+    pType: {
+        val: dbField_esm.db_base.newsType.all,
+            oldVal: dbField_esm.db_base.newsType.all,
+            init: dbField_esm.db_base.newsType.all,
+            msg: '',
+            state: 0,
+            options: [
+            {text: '全部', key: dbField_esm.db_base.newsType.all, value: dbField_esm.db_base.newsType.all},
+            {text: '新闻', key: dbField_esm.db_base.newsType.news, value: dbField_esm.db_base.newsType.news},
+            {text: '解决方案', key: dbField_esm.db_base.newsType.solution, value: dbField_esm.db_base.newsType.solution},
+        ]
+    },
+    type: {
+        val: '',
+            init: '',
+            msg: '',
+            state: 0,
+            options: [],
+            disables: ['all'],
+    }
+}
+let formVerify = new FormVerify(form,fieldCheck);
+formVerify.check(false);
+
+```

lib/formVerify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"formVerify.d.ts","sourceRoot":"","sources":["../src/formVerify.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,cAAc,CAAC;AAStC;;;;;;GAMG;AACH,cAAM,UAAU;IACZ,QAAQ,EAAC,UAAU,GAAG,IAAI,CAAQ;IAElC,UAAU,EAAC,UAAU,CAAC;IAGtB,aAAa,EAAE,gBAAgB,CAE9B;IACD,MAAM,EAAE,gBAAgB,CAEtB;IAEF,OAAc,iBAAiB,EAAE,MAAM,CAAC;IACxC,OAAc,cAAc,EAAE,MAAM,CAAC;IACrC,OAAc,iBAAiB,EAAE,MAAM,CAAC;IAExC,iBAAiB,EAAE,MAAM,CAAK;IAC9B,cAAc,EAAE,MAAM,CAAK;IAC3B,iBAAiB,EAAE,MAAM,CAAK;gBAElB,UAAU,EAAC,UAAU,EAAE,UAAU,CAAC,EAAC,UAAU,EAAE,MAAM,CAAC,EAAC,gBAAgB;IAiBnF,MAAM,CAAC,QAAQ,CAAE,GAAG,EAAC,GAAG;IAIxB;;;;;;;;OAQG;IACH,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,OAAO;IA6G7C;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAG,UAAU,EAAE,UAAU;IAYhD;;;;;OAKG;IACI,SAAS,CAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO;IAkGlE;;;OAGG;IACI,KAAK,CAAE,WAAW,GAAC,OAAe,GAAI,OAAO;CAIvD;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"formVerify.d.ts","sourceRoot":"","sources":["../src/formVerify.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,cAAc,CAAC;AAStC;;;;;;GAMG;AACH,cAAM,UAAU;IACZ,QAAQ,EAAC,UAAU,GAAG,IAAI,CAAQ;IAElC,UAAU,EAAC,UAAU,CAAC;IAGtB,aAAa,EAAE,gBAAgB,CAE9B;IACD,MAAM,EAAE,gBAAgB,CAEtB;IAEF,OAAc,iBAAiB,EAAE,MAAM,CAAC;IACxC,OAAc,cAAc,EAAE,MAAM,CAAC;IACrC,OAAc,iBAAiB,EAAE,MAAM,CAAC;IAExC,iBAAiB,EAAE,MAAM,CAAK;IAC9B,cAAc,EAAE,MAAM,CAAK;IAC3B,iBAAiB,EAAE,MAAM,CAAK;gBAElB,UAAU,EAAC,UAAU,EAAE,UAAU,CAAC,EAAC,UAAU,EAAE,MAAM,CAAC,EAAC,gBAAgB;IAiBnF,MAAM,CAAC,QAAQ,CAAE,GAAG,EAAC,GAAG;IAIxB;;;;;;;;OAQG;IACH,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,UAAU,EAClB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,OAAO;IA8G7C;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CAAG,UAAU,EAAE,UAAU;IAYhD;;;;;OAKG;IACI,SAAS,CAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO;IAmGlE;;;OAGG;IACI,KAAK,CAAE,WAAW,GAAC,OAAe,GAAI,OAAO;CAIvD;AAED,eAAe,UAAU,CAAC"}

lib/formVerify.js

@@ -88,7 +88,7 @@ class FormVerify {
                     hasInit = true;
                 }
                 // 判断该options是否为禁用项
-                if (disables && disables.indexOf(option.key) !== -1) {
+                if (disables && disables.find(item => item === option.key)) {
                     option.disabled = true;
                 }
             }
@@ -183,7 +183,7 @@ class FormVerify {
             }
             // 禁用值判断 array
             if (formItem.disables) {
-                if (formItem.disables.indexOf(formItem.val || '') !== -1) {
+                if (formItem.disables.find(item => item === formItem.val)) {
                     formItem.msg = '该项内容不合法';
                     r = false;
                 }

src/formVerify.ts

@@ -110,7 +110,8 @@ class FormVerify {
                 }
 
                 // 判断该options是否为禁用项
-                if ( disables && disables.indexOf(option.key) !== -1 ){
+
+                if ( disables && disables.find(item=>item === option.key) ){
                     option.disabled = true;
                 }
             }

src/types/fieldCheck.d.ts

@@ -9,8 +9,8 @@ type errMessage = string | undefined;
  */
 enum checkCode {
     code_pass = 1,
-    code_notPass = 2,
-    code_notMatch = 3
+    code_notPass,
+    code_notMatch
 }
 
 type checkFields = Array<string | RegExp>;

src/types/formVerify.d.ts

@@ -6,8 +6,9 @@
  * @property [checkField] 依赖字段
  */
 type formOption = {
-    key: string;
-    value: string;
+    text: string;
+    key: string | number;
+    value: string | number;
     disabled?: boolean;
     checkField?: string;
 }