@ebuilding/biz-form 2.3.0 → 2.3.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/fesm2022/basic.mjs +1 -1
  2. package/fesm2022/basic.mjs.map +1 -1
  3. package/fesm2022/service.mjs +7 -4
  4. package/fesm2022/service.mjs.map +1 -1
  5. package/fesm2022/srv.basic.mjs +7 -4
  6. package/fesm2022/srv.basic.mjs.map +1 -1
  7. package/fesm2022/srv.default.service.mjs +1 -1
  8. package/fesm2022/srv.default.service.mjs.map +1 -1
  9. package/fesm2022/srv.form.default.service.mjs +1 -1
  10. package/fesm2022/srv.form.default.service.mjs.map +1 -1
  11. package/fesm2022/srv.form.service.mjs +2 -2
  12. package/fesm2022/srv.form.service.mjs.map +1 -1
  13. package/fesm2022/srv.form2.service.mjs +1 -1
  14. package/fesm2022/srv.form2.service.mjs.map +1 -1
  15. package/fesm2022/srv.formGroup.service.mjs +1 -1
  16. package/fesm2022/srv.formGroup.service.mjs.map +1 -1
  17. package/package.json +25 -25
  18. package/service/basic/index.d.ts +2 -0
package/fesm2022/srv.form2.service.mjs CHANGED
@@ -41,7 +41,7 @@ class FormBasicService2 {
41
41
  this.globalSrv.subscribe('deon-field-repeat', (res) => {
42
42
  if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {
43
43
  if (res.type == 'delete') {
44
- this.options._buildForm(true);
44
+ //移除//(<any>this.options)._buildForm(true);
45
45
  }
46
46
  }
47
47
  });
package/fesm2022/srv.form2.service.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"srv.form2.service.mjs","sources":["../../../../packages/biz-form/service/form2.service/index.ts","../../../../packages/biz-form/service/form2.service/srv.form2.service.ts"],"sourcesContent":["import { Directive, OnDestroy } from '@angular/core';\r\nimport { FormGroup } from '@angular/forms';\r\nimport { _HttpClient } from '@delon/theme';\r\nimport { FormlyFormOptions, FormlyFieldConfig, FormlyFormBuilder } from '@ebuilding-form/core';\r\nimport { NzMessageService } from 'ng-zorro-antd/message';\r\nimport { DeonFormUtilService } from '@ebuilding/base/shared.srv/deon.util';\r\nimport { GramGlobalService } from '@ebuilding/base/shared.srv/global.event';\r\nimport { CommAPIService } from '@ebuilding/base/shared.srv/commApi.service';\r\n\r\nimport _ from 'lodash';\r\nimport { of, Subject, zip } from 'rxjs';\r\n\r\n@Directive()\r\nexport abstract class FormBasicService2 implements OnDestroy {\r\n config: any = null;\r\n\r\n loading: boolean = true;\r\n form = new FormGroup({});\r\n model: any = {};\r\n options: FormlyFormOptions = {};\r\n fields: FormlyFieldConfig[] = [];\r\n\r\n /**\r\n * 配置参数\r\n */\r\n argList: any[] = [];\r\n\r\n /**\r\n * 销毁\r\n */\r\n onDestroy$ = new Subject<void>();\r\n\r\n constructor(\r\n public http: _HttpClient,\r\n public utilService: DeonFormUtilService,\r\n public deonFormBuilder: FormlyFormBuilder,\r\n public globalSrv: GramGlobalService,\r\n public msg: NzMessageService,\r\n public commAPISrv: CommAPIService,\r\n ) {\r\n this.globalSrv.subscribe('deon-field-repeat', (res: any) => {\r\n if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {\r\n if (res.type == 'delete') {\r\n (<any>this.options)._buildForm(true);\r\n }\r\n }\r\n });\r\n }\r\n\r\n ngOnDestroy() {\r\n this.onDestroy$.next();\r\n this.onDestroy$.complete();\r\n }\r\n\r\n /*\r\n 获取设计\r\n */\r\n getDesign() {\r\n let apiName: any = this.commAPISrv.getFormDesign(this.config.moduleCode, this.config.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取角色\r\n */\r\n getRole() {\r\n let params: any = {\r\n formId: this.config.formId,\r\n type: this.config.type,\r\n };\r\n let apiName: any = this.commAPISrv.getFormRole(this.config.moduleCode);\r\n return this.http.post(`${apiName}`, params);\r\n }\r\n\r\n /*\r\n 获取配置-下拉选项\r\n */\r\n getDropDown() {\r\n let apiName: any = this.commAPISrv.getFormDropDown(this.config.moduleCode, this.config.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取配置-表单数据\r\n */\r\n getFromModel() {\r\n let params: any = {\r\n formId: this.config.formId,\r\n id: this.config.id,\r\n };\r\n if (this.config.type != 'ADD' && this.config.id!!) {\r\n let apiName: any = null;\r\n if (this.config.api!! && this.config.api.modelAPI!!) {\r\n apiName = this.config.api.modelAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormModel(this.config.moduleCode);\r\n }\r\n return this.http.post(`${apiName}`, params);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /*\r\n 获取配置-表单默认值\r\n */\r\n getFromDefaultModel() {\r\n if (this.config.type == 'ADD' && this.config.formId!!) {\r\n let apiName: any = null;\r\n if (this.config.api!! && this.config.api.modelDefaultAPI!!) {\r\n apiName = this.config.api.modelDefaultAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormDefaultModel(this.config.moduleCode);\r\n }\r\n return this.http.post(`${apiName}/${this.config.formId}`);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /**\r\n * 获取默认参数\r\n */\r\n getFromArgInfo() {\r\n if (this.config?.argInfo!! && this.argList!! && Array.isArray(this.argList) && this.argList.length > 0) {\r\n this.argList.forEach((item: any) => {\r\n if (item.argFieldId!! && item.argName!! && this.config.argInfo[item.argName]!!) {\r\n this.model[item.argFieldId] = this.config?.argInfo[item.argName];\r\n }\r\n });\r\n }\r\n }\r\n\r\n /**\r\n * 组装配置\r\n */\r\n getPageConfig() {\r\n new Promise((resolve: any) => {\r\n zip(this.getDesign(), this.getRole(), this.getDropDown(), this.getFromModel(), this.getFromDefaultModel()).subscribe(\r\n ([design, role, drop, d, m]) => {\r\n this.model = {};\r\n //传入的值\r\n if (this.config.model != undefined && this.config.model != null) {\r\n this.model = Object.assign(this.model, this.config.model);\r\n }\r\n if (design.success == true && _.get(design, 'result.basic.json')!!) {\r\n /**\r\n * 配置参数\r\n */\r\n if (_.get(design, 'result.listArg')!! && Array.isArray(_.get(design, 'result.listArg'))) {\r\n this.argList = _.get(design, 'result.listArg');\r\n }\r\n this.getFromArgInfo();\r\n\r\n /**\r\n * 表单JSON\r\n */\r\n let fieldConfigs: FormlyFieldConfig[] = JSON.parse(_.get(design, 'result.basic.json'));\r\n let fieldRole: any = {};\r\n let fieldOptions: any = {};\r\n\r\n //字段权限\r\n if (role.success == true && role.result!!) {\r\n fieldRole = role.result;\r\n }\r\n\r\n //字段Options\r\n if (drop.success == true && drop.result!!) {\r\n fieldOptions = drop.result;\r\n }\r\n\r\n //默认值\r\n if (d!! && d.success == true && d.result!!) {\r\n this.model = Object.assign(this.model, d.result);\r\n }\r\n\r\n //获取的表单值\r\n if (m!! && m.success == true && m.result!!) {\r\n this.model = Object.assign(this.model, m.result);\r\n }\r\n //this.utilService.initFormFieldConfig(fieldConfigs, fieldRole, fieldOptions, this.model, this, (e: any, field: any) => { });\r\n\r\n this.fields = fieldConfigs;\r\n\r\n setTimeout(() => {\r\n if (this.options != undefined && this.options != null && this.options?.resetModel) {\r\n this.options?.resetModel();\r\n }\r\n }, 0);\r\n }\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n resolve();\r\n },\r\n );\r\n });\r\n }\r\n\r\n save() {\r\n if (!this.form.valid) {\r\n return;\r\n }\r\n this.loading = true;\r\n let apiName = null;\r\n if (this.config.type == 'ADD') {\r\n if (this.config.api!! && this.config.api.addAPI!!) {\r\n apiName = this.config.api.addAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormAdd(this.config.moduleCode);\r\n }\r\n } else if (this.config.type == 'EDIT') {\r\n if (this.config.api!! && this.config.api.editAPI!!) {\r\n apiName = this.config.api.editAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormUpdate(this.config.moduleCode);\r\n }\r\n }\r\n this.http\r\n .post(`${apiName}`, {\r\n id: this.config.id,\r\n formId: this.config.formId,\r\n modelJson: this.model,\r\n })\r\n .subscribe(\r\n (res: any) => {\r\n this.loading = false;\r\n if (res && res.success == true) {\r\n this.msg.success('保存成功!');\r\n }\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n );\r\n }\r\n\r\n btnClose() { }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"srv.form2.service.mjs","sources":["../../../../packages/biz-form/service/form2.service/index.ts","../../../../packages/biz-form/service/form2.service/srv.form2.service.ts"],"sourcesContent":["import { Directive, OnDestroy } from '@angular/core';\r\nimport { FormGroup } from '@angular/forms';\r\nimport { _HttpClient } from '@delon/theme';\r\nimport { FormlyFormOptions, FormlyFieldConfig, FormlyFormBuilder } from '@ebuilding-form/core';\r\nimport { NzMessageService } from 'ng-zorro-antd/message';\r\nimport { DeonFormUtilService } from '@ebuilding/base/shared.srv/deon.util';\r\nimport { GramGlobalService } from '@ebuilding/base/shared.srv/global.event';\r\nimport { CommAPIService } from '@ebuilding/base/shared.srv/commApi.service';\r\n\r\nimport _ from 'lodash';\r\nimport { of, Subject, zip } from 'rxjs';\r\n\r\n@Directive()\r\nexport abstract class FormBasicService2 implements OnDestroy {\r\n config: any = null;\r\n\r\n loading: boolean = true;\r\n form = new FormGroup({});\r\n model: any = {};\r\n options: FormlyFormOptions = {};\r\n fields: FormlyFieldConfig[] = [];\r\n\r\n /**\r\n * 配置参数\r\n */\r\n argList: any[] = [];\r\n\r\n /**\r\n * 销毁\r\n */\r\n onDestroy$ = new Subject<void>();\r\n\r\n constructor(\r\n public http: _HttpClient,\r\n public utilService: DeonFormUtilService,\r\n public deonFormBuilder: FormlyFormBuilder,\r\n public globalSrv: GramGlobalService,\r\n public msg: NzMessageService,\r\n public commAPISrv: CommAPIService,\r\n ) {\r\n this.globalSrv.subscribe('deon-field-repeat', (res: any) => {\r\n if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {\r\n if (res.type == 'delete') {\r\n //移除//(<any>this.options)._buildForm(true);\r\n }\r\n }\r\n });\r\n }\r\n\r\n ngOnDestroy() {\r\n this.onDestroy$.next();\r\n this.onDestroy$.complete();\r\n }\r\n\r\n /*\r\n 获取设计\r\n */\r\n getDesign() {\r\n let apiName: any = this.commAPISrv.getFormDesign(this.config.moduleCode, this.config.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取角色\r\n */\r\n getRole() {\r\n let params: any = {\r\n formId: this.config.formId,\r\n type: this.config.type,\r\n };\r\n let apiName: any = this.commAPISrv.getFormRole(this.config.moduleCode);\r\n return this.http.post(`${apiName}`, params);\r\n }\r\n\r\n /*\r\n 获取配置-下拉选项\r\n */\r\n getDropDown() {\r\n let apiName: any = this.commAPISrv.getFormDropDown(this.config.moduleCode, this.config.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取配置-表单数据\r\n */\r\n getFromModel() {\r\n let params: any = {\r\n formId: this.config.formId,\r\n id: this.config.id,\r\n };\r\n if (this.config.type != 'ADD' && this.config.id!!) {\r\n let apiName: any = null;\r\n if (this.config.api!! && this.config.api.modelAPI!!) {\r\n apiName = this.config.api.modelAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormModel(this.config.moduleCode);\r\n }\r\n return this.http.post(`${apiName}`, params);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /*\r\n 获取配置-表单默认值\r\n */\r\n getFromDefaultModel() {\r\n if (this.config.type == 'ADD' && this.config.formId!!) {\r\n let apiName: any = null;\r\n if (this.config.api!! && this.config.api.modelDefaultAPI!!) {\r\n apiName = this.config.api.modelDefaultAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormDefaultModel(this.config.moduleCode);\r\n }\r\n return this.http.post(`${apiName}/${this.config.formId}`);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /**\r\n * 获取默认参数\r\n */\r\n getFromArgInfo() {\r\n if (this.config?.argInfo!! && this.argList!! && Array.isArray(this.argList) && this.argList.length > 0) {\r\n this.argList.forEach((item: any) => {\r\n if (item.argFieldId!! && item.argName!! && this.config.argInfo[item.argName]!!) {\r\n this.model[item.argFieldId] = this.config?.argInfo[item.argName];\r\n }\r\n });\r\n }\r\n }\r\n\r\n /**\r\n * 组装配置\r\n */\r\n getPageConfig() {\r\n new Promise((resolve: any) => {\r\n zip(this.getDesign(), this.getRole(), this.getDropDown(), this.getFromModel(), this.getFromDefaultModel()).subscribe(\r\n ([design, role, drop, d, m]) => {\r\n this.model = {};\r\n //传入的值\r\n if (this.config.model != undefined && this.config.model != null) {\r\n this.model = Object.assign(this.model, this.config.model);\r\n }\r\n if (design.success == true && _.get(design, 'result.basic.json')!!) {\r\n /**\r\n * 配置参数\r\n */\r\n if (_.get(design, 'result.listArg')!! && Array.isArray(_.get(design, 'result.listArg'))) {\r\n this.argList = _.get(design, 'result.listArg');\r\n }\r\n this.getFromArgInfo();\r\n\r\n /**\r\n * 表单JSON\r\n */\r\n let fieldConfigs: FormlyFieldConfig[] = JSON.parse(_.get(design, 'result.basic.json'));\r\n let fieldRole: any = {};\r\n let fieldOptions: any = {};\r\n\r\n //字段权限\r\n if (role.success == true && role.result!!) {\r\n fieldRole = role.result;\r\n }\r\n\r\n //字段Options\r\n if (drop.success == true && drop.result!!) {\r\n fieldOptions = drop.result;\r\n }\r\n\r\n //默认值\r\n if (d!! && d.success == true && d.result!!) {\r\n this.model = Object.assign(this.model, d.result);\r\n }\r\n\r\n //获取的表单值\r\n if (m!! && m.success == true && m.result!!) {\r\n this.model = Object.assign(this.model, m.result);\r\n }\r\n //this.utilService.initFormFieldConfig(fieldConfigs, fieldRole, fieldOptions, this.model, this, (e: any, field: any) => { });\r\n\r\n this.fields = fieldConfigs;\r\n\r\n setTimeout(() => {\r\n if (this.options != undefined && this.options != null && this.options?.resetModel) {\r\n this.options?.resetModel();\r\n }\r\n }, 0);\r\n }\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n resolve();\r\n },\r\n );\r\n });\r\n }\r\n\r\n save() {\r\n if (!this.form.valid) {\r\n return;\r\n }\r\n this.loading = true;\r\n let apiName = null;\r\n if (this.config.type == 'ADD') {\r\n if (this.config.api!! && this.config.api.addAPI!!) {\r\n apiName = this.config.api.addAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormAdd(this.config.moduleCode);\r\n }\r\n } else if (this.config.type == 'EDIT') {\r\n if (this.config.api!! && this.config.api.editAPI!!) {\r\n apiName = this.config.api.editAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormUpdate(this.config.moduleCode);\r\n }\r\n }\r\n this.http\r\n .post(`${apiName}`, {\r\n id: this.config.id,\r\n formId: this.config.formId,\r\n modelJson: this.model,\r\n })\r\n .subscribe(\r\n (res: any) => {\r\n this.loading = false;\r\n if (res && res.success == true) {\r\n this.msg.success('保存成功!');\r\n }\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n );\r\n }\r\n\r\n btnClose() { }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
package/fesm2022/srv.formGroup.service.mjs CHANGED
@@ -41,7 +41,7 @@ class FormGroupBasicService {
41
41
  this.globalSrv.subscribe('deon-field-repeat', (res) => {
42
42
  if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {
43
43
  if (res.type == 'delete') {
44
- this.options._buildForm(true);
44
+ //移除//(<any>this.options)._buildForm(true);
45
45
  }
46
46
  }
47
47
  });
package/fesm2022/srv.formGroup.service.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"srv.formGroup.service.mjs","sources":["../../../../packages/biz-form/service/formGroup.service/index.ts","../../../../packages/biz-form/service/formGroup.service/srv.formGroup.service.ts"],"sourcesContent":["import { Directive, Input, ViewChild, ElementRef, OnDestroy } from '@angular/core';\r\nimport { FormGroup } from '@angular/forms';\r\nimport { _HttpClient } from '@delon/theme';\r\nimport { FormlyFormOptions, FormlyFieldConfig, FormlyFormBuilder } from '@ebuilding-form/core';\r\nimport { NzMessageService } from 'ng-zorro-antd/message';\r\n\r\nimport { DeonFormUtilService } from '@ebuilding/base/shared.srv/deon.util';\r\nimport { GramGlobalService } from '@ebuilding/base/shared.srv/global.event';\r\nimport { CommAPIService } from '@ebuilding/base/shared.srv/commApi.service';\r\n\r\nimport { of, Subject, zip } from 'rxjs';\r\nimport _ from 'lodash';\r\n@Directive()\r\nexport abstract class FormGroupBasicService implements OnDestroy {\r\n pageConfig: any = null;\r\n\r\n loading: boolean = true;\r\n form = new FormGroup({});\r\n model: any = {};\r\n options: FormlyFormOptions = {};\r\n fields: FormlyFieldConfig[] = [];\r\n\r\n /**\r\n * 配置参数\r\n */\r\n argList: any[] = [];\r\n\r\n /**\r\n * 销毁\r\n */\r\n onDestroy$ = new Subject<void>();\r\n\r\n constructor(\r\n public http: _HttpClient,\r\n public utilService: DeonFormUtilService,\r\n public deonFormBuilder: FormlyFormBuilder,\r\n public globalSrv: GramGlobalService,\r\n public msg: NzMessageService,\r\n public commAPISrv: CommAPIService,\r\n ) {\r\n this.globalSrv.subscribe('deon-field-repeat', (res: any) => {\r\n if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {\r\n if (res.type == 'delete') {\r\n (<any>this.options)._buildForm(true);\r\n }\r\n }\r\n });\r\n }\r\n\r\n ngOnDestroy() {\r\n this.onDestroy$.next();\r\n this.onDestroy$.complete();\r\n }\r\n\r\n /*\r\n 获取设计\r\n */\r\n getDesign() {\r\n let apiName: any = this.commAPISrv.getFormDesign(this.pageConfig.moduleCode, this.pageConfig.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取角色\r\n */\r\n getRole() {\r\n let params: any = {\r\n formId: this.pageConfig.formId,\r\n type: this.pageConfig.type,\r\n };\r\n let apiName: any = this.commAPISrv.getFormRole(this.pageConfig.moduleCode);\r\n return this.http.post(`${apiName}`, params);\r\n }\r\n\r\n /*\r\n 获取配置-下拉选项\r\n */\r\n getDropDown() {\r\n let apiName: any = this.commAPISrv.getFormDropDown(this.pageConfig.moduleCode, this.pageConfig.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取配置-表单数据\r\n */\r\n getFromModel() {\r\n let params: any = {\r\n formId: this.pageConfig.formId,\r\n id: this.pageConfig.id,\r\n };\r\n if (this.pageConfig.type != 'ADD' && this.pageConfig.id!!) {\r\n let apiName: any = null;\r\n if (this.pageConfig.api!! && this.pageConfig.api.modelAPI!!) {\r\n apiName = this.pageConfig.api.modelAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormModel(this.pageConfig.moduleCode);\r\n }\r\n return this.http.post(`${apiName}`, params);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /*\r\n 获取配置-表单默认值\r\n */\r\n getFromDefaultModel() {\r\n if (this.pageConfig.type == 'ADD' && this.pageConfig.formId!!) {\r\n let apiName: any = null;\r\n if (this.pageConfig.api!! && this.pageConfig.api.modelDefaultAPI!!) {\r\n apiName = this.pageConfig.api.modelDefaultAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormDefaultModel(this.pageConfig.moduleCode);\r\n }\r\n return this.http.post(`${apiName}/${this.pageConfig.formId}`);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /**\r\n * 获取默认参数\r\n */\r\n getFromArgInfo() {\r\n if (this.pageConfig?.argInfo!! && this.argList!! && Array.isArray(this.argList) && this.argList.length > 0) {\r\n this.argList.forEach((item: any) => {\r\n if (item.argFieldId!! && item.argName!! && this.pageConfig.argInfo[item.argName]!!) {\r\n this.model[item.argFieldId] = this.pageConfig?.argInfo[item.argName];\r\n }\r\n });\r\n }\r\n }\r\n\r\n /**\r\n * 组装配置\r\n */\r\n getPageConfig() {\r\n new Promise((resolve: any) => {\r\n zip(this.getDesign(), this.getRole(), this.getDropDown(), this.getFromModel(), this.getFromDefaultModel()).subscribe(\r\n ([design, role, drop, d, m]) => {\r\n this.model = {};\r\n //传入的值\r\n if (this.pageConfig.model != undefined && this.pageConfig.model != null) {\r\n this.model = Object.assign(this.model, this.pageConfig.model);\r\n }\r\n if (design.success == true && _.get(design, 'result.basic.json')!!) {\r\n /**\r\n * 配置参数\r\n */\r\n if (_.get(design, 'result.listArg')!! && Array.isArray(_.get(design, 'result.listArg'))) {\r\n this.argList = _.get(design, 'result.listArg');\r\n }\r\n this.getFromArgInfo();\r\n\r\n /**\r\n * 表单JSON\r\n */\r\n let fieldConfigs: FormlyFieldConfig[] = JSON.parse(_.get(design, 'result.basic.json'));\r\n let fieldRole: any = {};\r\n let fieldOptions: any = {};\r\n\r\n //字段权限\r\n if (role.success == true && role.result!!) {\r\n fieldRole = role.result;\r\n }\r\n\r\n //字段Options\r\n if (drop.success == true && drop.result!!) {\r\n fieldOptions = drop.result;\r\n }\r\n\r\n //默认值\r\n if (d!! && d.success == true && d.result!!) {\r\n this.model = Object.assign(this.model, d.result);\r\n }\r\n\r\n //获取的表单值\r\n if (m!! && m.success == true && m.result!!) {\r\n this.model = Object.assign(this.model, m.result);\r\n }\r\n //this.utilService.initFormFieldConfig(fieldConfigs, fieldRole, fieldOptions, this.model, this, (e: any, field: any) => { });\r\n\r\n this.fields = fieldConfigs;\r\n\r\n setTimeout(() => {\r\n if (this.options != undefined && this.options != null && this.options?.resetModel) {\r\n this.options?.resetModel();\r\n }\r\n }, 0);\r\n this.formDataLoadAfter();\r\n }\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n resolve();\r\n },\r\n );\r\n });\r\n }\r\n\r\n save() {\r\n if (!this.form.valid) {\r\n return;\r\n }\r\n this.loading = true;\r\n let apiName = null;\r\n if (this.pageConfig.type == 'ADD') {\r\n if (this.pageConfig.api!! && this.pageConfig.api.addAPI!!) {\r\n apiName = this.pageConfig.api.addAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormAdd(this.pageConfig.moduleCode);\r\n }\r\n } else if (this.pageConfig.type == 'EDIT') {\r\n if (this.pageConfig.api!! && this.pageConfig.api.editAPI!!) {\r\n apiName = this.pageConfig.api.editAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormUpdate(this.pageConfig.moduleCode);\r\n }\r\n }\r\n this.http\r\n .post(`${apiName}`, {\r\n id: this.pageConfig.id,\r\n formId: this.pageConfig.formId,\r\n modelJson: this.model,\r\n })\r\n .subscribe(\r\n (res: any) => {\r\n this.loading = false;\r\n if (res && res.success == true) {\r\n this.msg.success('保存成功!');\r\n }\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n );\r\n }\r\n\r\n btnClose() {\r\n this.getPageConfig();\r\n }\r\n\r\n formDataLoadAfter() { }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"srv.formGroup.service.mjs","sources":["../../../../packages/biz-form/service/formGroup.service/index.ts","../../../../packages/biz-form/service/formGroup.service/srv.formGroup.service.ts"],"sourcesContent":["import { Directive, Input, ViewChild, ElementRef, OnDestroy } from '@angular/core';\r\nimport { FormGroup } from '@angular/forms';\r\nimport { _HttpClient } from '@delon/theme';\r\nimport { FormlyFormOptions, FormlyFieldConfig, FormlyFormBuilder } from '@ebuilding-form/core';\r\nimport { NzMessageService } from 'ng-zorro-antd/message';\r\n\r\nimport { DeonFormUtilService } from '@ebuilding/base/shared.srv/deon.util';\r\nimport { GramGlobalService } from '@ebuilding/base/shared.srv/global.event';\r\nimport { CommAPIService } from '@ebuilding/base/shared.srv/commApi.service';\r\n\r\nimport { of, Subject, zip } from 'rxjs';\r\nimport _ from 'lodash';\r\n@Directive()\r\nexport abstract class FormGroupBasicService implements OnDestroy {\r\n pageConfig: any = null;\r\n\r\n loading: boolean = true;\r\n form = new FormGroup({});\r\n model: any = {};\r\n options: FormlyFormOptions = {};\r\n fields: FormlyFieldConfig[] = [];\r\n\r\n /**\r\n * 配置参数\r\n */\r\n argList: any[] = [];\r\n\r\n /**\r\n * 销毁\r\n */\r\n onDestroy$ = new Subject<void>();\r\n\r\n constructor(\r\n public http: _HttpClient,\r\n public utilService: DeonFormUtilService,\r\n public deonFormBuilder: FormlyFormBuilder,\r\n public globalSrv: GramGlobalService,\r\n public msg: NzMessageService,\r\n public commAPISrv: CommAPIService,\r\n ) {\r\n this.globalSrv.subscribe('deon-field-repeat', (res: any) => {\r\n if (res != undefined && res.field != undefined && res.data != undefined && res.type != undefined) {\r\n if (res.type == 'delete') {\r\n //移除//(<any>this.options)._buildForm(true);\r\n }\r\n }\r\n });\r\n }\r\n\r\n ngOnDestroy() {\r\n this.onDestroy$.next();\r\n this.onDestroy$.complete();\r\n }\r\n\r\n /*\r\n 获取设计\r\n */\r\n getDesign() {\r\n let apiName: any = this.commAPISrv.getFormDesign(this.pageConfig.moduleCode, this.pageConfig.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取角色\r\n */\r\n getRole() {\r\n let params: any = {\r\n formId: this.pageConfig.formId,\r\n type: this.pageConfig.type,\r\n };\r\n let apiName: any = this.commAPISrv.getFormRole(this.pageConfig.moduleCode);\r\n return this.http.post(`${apiName}`, params);\r\n }\r\n\r\n /*\r\n 获取配置-下拉选项\r\n */\r\n getDropDown() {\r\n let apiName: any = this.commAPISrv.getFormDropDown(this.pageConfig.moduleCode, this.pageConfig.formId);\r\n return this.http.post(`${apiName}`);\r\n }\r\n\r\n /*\r\n 获取配置-表单数据\r\n */\r\n getFromModel() {\r\n let params: any = {\r\n formId: this.pageConfig.formId,\r\n id: this.pageConfig.id,\r\n };\r\n if (this.pageConfig.type != 'ADD' && this.pageConfig.id!!) {\r\n let apiName: any = null;\r\n if (this.pageConfig.api!! && this.pageConfig.api.modelAPI!!) {\r\n apiName = this.pageConfig.api.modelAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormModel(this.pageConfig.moduleCode);\r\n }\r\n return this.http.post(`${apiName}`, params);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /*\r\n 获取配置-表单默认值\r\n */\r\n getFromDefaultModel() {\r\n if (this.pageConfig.type == 'ADD' && this.pageConfig.formId!!) {\r\n let apiName: any = null;\r\n if (this.pageConfig.api!! && this.pageConfig.api.modelDefaultAPI!!) {\r\n apiName = this.pageConfig.api.modelDefaultAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormDefaultModel(this.pageConfig.moduleCode);\r\n }\r\n return this.http.post(`${apiName}/${this.pageConfig.formId}`);\r\n } else {\r\n return of(null);\r\n }\r\n }\r\n\r\n /**\r\n * 获取默认参数\r\n */\r\n getFromArgInfo() {\r\n if (this.pageConfig?.argInfo!! && this.argList!! && Array.isArray(this.argList) && this.argList.length > 0) {\r\n this.argList.forEach((item: any) => {\r\n if (item.argFieldId!! && item.argName!! && this.pageConfig.argInfo[item.argName]!!) {\r\n this.model[item.argFieldId] = this.pageConfig?.argInfo[item.argName];\r\n }\r\n });\r\n }\r\n }\r\n\r\n /**\r\n * 组装配置\r\n */\r\n getPageConfig() {\r\n new Promise((resolve: any) => {\r\n zip(this.getDesign(), this.getRole(), this.getDropDown(), this.getFromModel(), this.getFromDefaultModel()).subscribe(\r\n ([design, role, drop, d, m]) => {\r\n this.model = {};\r\n //传入的值\r\n if (this.pageConfig.model != undefined && this.pageConfig.model != null) {\r\n this.model = Object.assign(this.model, this.pageConfig.model);\r\n }\r\n if (design.success == true && _.get(design, 'result.basic.json')!!) {\r\n /**\r\n * 配置参数\r\n */\r\n if (_.get(design, 'result.listArg')!! && Array.isArray(_.get(design, 'result.listArg'))) {\r\n this.argList = _.get(design, 'result.listArg');\r\n }\r\n this.getFromArgInfo();\r\n\r\n /**\r\n * 表单JSON\r\n */\r\n let fieldConfigs: FormlyFieldConfig[] = JSON.parse(_.get(design, 'result.basic.json'));\r\n let fieldRole: any = {};\r\n let fieldOptions: any = {};\r\n\r\n //字段权限\r\n if (role.success == true && role.result!!) {\r\n fieldRole = role.result;\r\n }\r\n\r\n //字段Options\r\n if (drop.success == true && drop.result!!) {\r\n fieldOptions = drop.result;\r\n }\r\n\r\n //默认值\r\n if (d!! && d.success == true && d.result!!) {\r\n this.model = Object.assign(this.model, d.result);\r\n }\r\n\r\n //获取的表单值\r\n if (m!! && m.success == true && m.result!!) {\r\n this.model = Object.assign(this.model, m.result);\r\n }\r\n //this.utilService.initFormFieldConfig(fieldConfigs, fieldRole, fieldOptions, this.model, this, (e: any, field: any) => { });\r\n\r\n this.fields = fieldConfigs;\r\n\r\n setTimeout(() => {\r\n if (this.options != undefined && this.options != null && this.options?.resetModel) {\r\n this.options?.resetModel();\r\n }\r\n }, 0);\r\n this.formDataLoadAfter();\r\n }\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n () => {\r\n this.loading = false;\r\n resolve();\r\n },\r\n );\r\n });\r\n }\r\n\r\n save() {\r\n if (!this.form.valid) {\r\n return;\r\n }\r\n this.loading = true;\r\n let apiName = null;\r\n if (this.pageConfig.type == 'ADD') {\r\n if (this.pageConfig.api!! && this.pageConfig.api.addAPI!!) {\r\n apiName = this.pageConfig.api.addAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormAdd(this.pageConfig.moduleCode);\r\n }\r\n } else if (this.pageConfig.type == 'EDIT') {\r\n if (this.pageConfig.api!! && this.pageConfig.api.editAPI!!) {\r\n apiName = this.pageConfig.api.editAPI;\r\n } else {\r\n apiName = this.commAPISrv.getFormUpdate(this.pageConfig.moduleCode);\r\n }\r\n }\r\n this.http\r\n .post(`${apiName}`, {\r\n id: this.pageConfig.id,\r\n formId: this.pageConfig.formId,\r\n modelJson: this.model,\r\n })\r\n .subscribe(\r\n (res: any) => {\r\n this.loading = false;\r\n if (res && res.success == true) {\r\n this.msg.success('保存成功!');\r\n }\r\n },\r\n () => {\r\n this.loading = false;\r\n },\r\n );\r\n }\r\n\r\n btnClose() {\r\n this.getPageConfig();\r\n }\r\n\r\n formDataLoadAfter() { }\r\n}\r\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ebuilding/biz-form",
3
- "version": "2.3.0",
3
+ "version": "2.3.3",
4
4
  "dependencies": {
5
5
  "extend": "undefined",
6
6
  "tslib": "^2.3.0"
@@ -23,21 +23,25 @@
23
23
  "types": "./basic/index.d.ts",
24
24
  "default": "./fesm2022/basic.mjs"
25
25
  },
26
- "./custom": {
27
- "types": "./custom/index.d.ts",
28
- "default": "./fesm2022/custom.mjs"
29
- },
30
26
  "./empInfo": {
31
27
  "types": "./empInfo/index.d.ts",
32
28
  "default": "./fesm2022/empInfo.mjs"
33
29
  },
30
+ "./design": {
31
+ "types": "./design/index.d.ts",
32
+ "default": "./fesm2022/design.mjs"
33
+ },
34
+ "./custom": {
35
+ "types": "./custom/index.d.ts",
36
+ "default": "./fesm2022/custom.mjs"
37
+ },
34
38
  "./history": {
35
39
  "types": "./history/index.d.ts",
36
40
  "default": "./fesm2022/history.mjs"
37
41
  },
38
- "./design": {
39
- "types": "./design/index.d.ts",
40
- "default": "./fesm2022/design.mjs"
42
+ "./page": {
43
+ "types": "./page/index.d.ts",
44
+ "default": "./fesm2022/page.mjs"
41
45
  },
42
46
  "./preview": {
43
47
  "types": "./preview/index.d.ts",
@@ -51,45 +55,41 @@
51
55
  "types": "./service/index.d.ts",
52
56
  "default": "./fesm2022/service.mjs"
53
57
  },
54
- "./page": {
55
- "types": "./page/index.d.ts",
56
- "default": "./fesm2022/page.mjs"
57
- },
58
58
  "./service/basic": {
59
59
  "types": "./service/basic/index.d.ts",
60
60
  "default": "./fesm2022/srv.basic.mjs"
61
61
  },
62
+ "./service/basic.flow": {
63
+ "types": "./service/basic.flow/index.d.ts",
64
+ "default": "./fesm2022/srv.basic.flow.mjs"
65
+ },
62
66
  "./service/basic.drawer": {
63
67
  "types": "./service/basic.drawer/index.d.ts",
64
68
  "default": "./fesm2022/srv.basic.drawer.mjs"
65
69
  },
66
- "./service/basic.flow": {
67
- "types": "./service/basic.flow/index.d.ts",
68
- "default": "./fesm2022/srv.basic.flow.mjs"
70
+ "./service/basic.default": {
71
+ "types": "./service/basic.default/index.d.ts",
72
+ "default": "./fesm2022/srv.basic.default.mjs"
69
73
  },
70
74
  "./service/default.service": {
71
75
  "types": "./service/default.service/index.d.ts",
72
76
  "default": "./fesm2022/srv.default.service.mjs"
73
77
  },
74
- "./service/basic.default": {
75
- "types": "./service/basic.default/index.d.ts",
76
- "default": "./fesm2022/srv.basic.default.mjs"
78
+ "./service/form.default.service": {
79
+ "types": "./service/form.default.service/index.d.ts",
80
+ "default": "./fesm2022/srv.form.default.service.mjs"
77
81
  },
78
82
  "./service/form.workflow": {
79
83
  "types": "./service/form.workflow/index.d.ts",
80
84
  "default": "./fesm2022/srv.form.workflow.mjs"
81
85
  },
82
- "./service/form.service": {
83
- "types": "./service/form.service/index.d.ts",
84
- "default": "./fesm2022/srv.form.service.mjs"
85
- },
86
86
  "./service/form2.service": {
87
87
  "types": "./service/form2.service/index.d.ts",
88
88
  "default": "./fesm2022/srv.form2.service.mjs"
89
89
  },
90
- "./service/form.default.service": {
91
- "types": "./service/form.default.service/index.d.ts",
92
- "default": "./fesm2022/srv.form.default.service.mjs"
90
+ "./service/form.service": {
91
+ "types": "./service/form.service/index.d.ts",
92
+ "default": "./fesm2022/srv.form.service.mjs"
93
93
  },
94
94
  "./service/formGroup.service": {
95
95
  "types": "./service/formGroup.service/index.d.ts",
package/service/basic/index.d.ts CHANGED
@@ -9,6 +9,7 @@ import { DeonFormResetService } from '@ebuilding/base/shared.srv/deon2.util';
9
9
  import { GramBaseDialogService } from '@ebuilding/base/shared.srv/base-dialog.service';
10
10
  import { GramGlobalService } from '@ebuilding/base/shared.srv/global.event';
11
11
  import { CommAPIService } from '@ebuilding/base/shared.srv/commApi.service';
12
+ import { FormlySerializerService } from "@ebuilding/base/shared.srv/formly-serializer.service";
12
13
  import { Subject } from 'rxjs';
13
14
  import * as i0 from "@angular/core";
14
15
  export declare abstract class BasicService implements OnDestroy {
@@ -61,6 +62,7 @@ export declare abstract class BasicService implements OnDestroy {
61
62
  headerConfig: any;
62
63
  isHeader: boolean;
63
64
  otherData: any;
65
+ serializerSrv: FormlySerializerService;
64
66
  config: any;
65
67
  btnCloseEvent: EventEmitter<any>;
66
68
  btnSaveEvent: EventEmitter<any>;