@dhccmobile/vue3-lo-form 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhccmobile/vue3-lo-form",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "VUE3动态表单",
   "private": false,
   "main": "dist/vue3-lo-form.umd.js",

package/src/components/form/DvForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="desForm?.controls?.length" :class="'lo-form-container ' + ('lo-' + (edit ? 'enable' : 'disable') + '-edit') + ' lo-class-style-' + styleMode">
+  <div v-if="desForm?.controls?.length" ref="formView" :class="'lo-form-container ' + ('lo-' + (edit ? 'enable' : 'disable') + '-edit') + ' lo-class-style-' + styleMode">
     <dv-form-layout v-for="(item, i) in desForm.controls" :key="i" :control="item" :customFormats="customFormats" :index="i" @change="onChange($event)" @focus="onFocus($event)" @blur="onBlur($event)" @click="onClick($event)" @addon-before="onAddonBeforeHandler($event)" @addon-after="onAddonAfterHandler($event)" @add-item="selectAddItem($event)">
       <template v-for="propName in Object.keys(this.$slots)" v-slot:[propName]="slotProps">
         <slot :name="propName" :content="slotProps.content" :control="slotProps.control" :onChange="slotProps.onChange"></slot>
@@ -185,6 +185,22 @@ export default class DyForm extends Vue {
         this.formApi?.setFieldChangeHistory(this.history);
       }
       this.$emit("complete");
+      this.$nextTick(() => {
+        try {
+          const formView: any = this.$refs.formView;
+          const cons = formView.getElementsByClassName("lo-control-container");
+          const len = cons.length;
+          if (len > 2) {
+            const con1 = cons[len - 1];
+            const con2 = cons[len - 2];
+            if (con1.clientWidth === con1.clientWidth && con1.offsetLeft !== con2.offsetLeft) {
+              con1.style.width = "200%";
+            }
+          }
+        } catch (e) {
+          console.error("自动修改表单宽度错误" + e);
+        }
+      });
     }
   }
 

package/src/components/form/DvFormLayout.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="lo-control-container" :style="{ width: divWidthCompatibleToIe }" v-if="(control.type === formFieldClass.Base.code || control.type === formFieldClass.Senior.code) && !controlAttr.isHideControl">
+  <div v-if="(control.type === formFieldClass.Base.code || control.type === formFieldClass.Senior.code) && !controlAttr.isHideControl" class="lo-control-container" :style="{ width: divWidthCompatibleToIe }">
     <div class="lo-control-box">
       <a-form-item
         :labelCol="{
@@ -262,14 +262,14 @@
       </a-form-item>
     </div>
   </div>
-  <a-form :class="'w-100 lo-empty-layout-container' + (controlAttr.layoutName ? ' lo-form-layout-' + controlAttr.layoutName : '')" :layout="layout" :style="emptyLayoutContainerStyle" v-else-if="control.type === formFieldClass.Layout.code && control.code === formFieldType.Empty.code">
+  <a-form v-else-if="control.type === formFieldClass.Layout.code && control.code === formFieldType.Empty.code" :class="'w-100 lo-empty-layout-container' + (controlAttr.layoutName ? ' lo-form-layout-' + controlAttr.layoutName : '')" :layout="layout" :style="emptyLayoutContainerStyle">
     <dv-form-layout v-for="(item, i) in control.subControls" :key="i" :index="i" :customFormats="customFormats" :control="item" :parentControl="control" @change="onChange($event)" @click="onClick($event)" @focus="onFocus($event)" @blur="onBlur($event)" @addon-before="onAddonBeforeHandler($event)" @addon-after="onAddonAfterHandler($event)" @add-item="selectAddItem($event)">
       <template v-for="scopedPropName in Object.keys($slots)" v-slot:[scopedPropName]="{ content, control, onChange }">
         <slot v-bind:content="content" v-bind:control="control" v-bind:onChange="onChange" :name="scopedPropName"></slot>
       </template>
     </dv-form-layout>
   </a-form>
-  <a-form :class="'w-100 lo-general-layout-container' + (controlAttr.layoutName ? ' lo-form-layout-' + controlAttr.layoutName : '')" :layout="layout" :style="generalLayoutContainerStyle" v-else-if="control.type === formFieldClass.Layout.code && control.code !== formFieldType.Empty.code">
+  <a-form v-else-if="control.type === formFieldClass.Layout.code && control.code !== formFieldType.Empty.code" :class="'w-100 lo-general-layout-container' + (controlAttr.layoutName ? ' lo-form-layout-' + controlAttr.layoutName : '')" :layout="layout" :style="generalLayoutContainerStyle">
     <dv-form-layout
       v-for="(item, i) in control.subControls"
       :key="i"
@@ -1479,7 +1479,8 @@ export default class DvFormLayout extends Vue {
 }
 .lo-control-container {
   box-sizing: border-box;
-  border: 1px solid #e4e4e4;
+  border-right: 1px solid #e8e8e8;
+  border-bottom: 1px solid #e8e8e8;
   .lo-control-box {
     height: 100%;
     .ant-form-item {
@@ -1654,6 +1655,8 @@ export default class DvFormLayout extends Vue {
 .lo-empty-layout-container {
   box-sizing: border-box;
   display: grid;
+  border-top: 1px #e8e8e8 solid;
+  border-left: 1px #e8e8e8 solid;
 }
 .lo-general-layout-container {
   box-sizing: border-box;

package/src/core/FormApi.ts

@@ -241,7 +241,8 @@ export class FormApi {
    */
   getText(key: string): any {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.text();
     }
     return "";
@@ -254,7 +255,8 @@ export class FormApi {
    */
   getOptions(key: string): any[] {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr
       return extractOptions(control.controlAttr);
     }
     return [];
@@ -284,7 +286,8 @@ export class FormApi {
    */
   getAttribute(key: string, attribute: Attribute): any {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr
       return control.controlAttr[attribute];
     }
   }
@@ -312,7 +315,8 @@ export class FormApi {
    */
   getValidate(key: string, name: string): any {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.getValidate(name);
     }
   }
@@ -324,7 +328,8 @@ export class FormApi {
    */
   removeValidate(key: string, validateName: string): void {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       const validates: Validate[] = control.validates;
       if (validates && validates.length > 0) {
         const index = validates.findIndex((item) => item.name === validateName);
@@ -342,7 +347,8 @@ export class FormApi {
    */
   removeAllValidates(key: string): void {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       control.validates = [];
     }
   }
@@ -354,7 +360,8 @@ export class FormApi {
    */
   getValidates(key: string): Validate[] {
     const control: AbstractControl = this.getControl(key);
-    if (control && control instanceof FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.validates;
     }
     return [];
@@ -383,7 +390,8 @@ export class FormApi {
     if (control == null) {
       setTimeout(() => {
         control = this.getControl(key);
-        if (control && control instanceof FormControl) {
+        if (control) {
+          //control && control instanceof FormControl
           this.setValidateInner(control, validate, isCover);
         }
       });
@@ -567,7 +575,8 @@ export class FormApi {
       if (control == null) {
         setTimeout(() => {
           control = this.getControl(propertyName, undefined, false);
-          if (control && control instanceof FormControl) {
+          if (control) {
+            //control && control instanceof FormControl
             const history = (fieldChangeHistory[propertyName] || []).sort((a, b) => {
               const aTime = new Date(a.time).getTime();
               const bTime = new Date(b.time).getTime();
@@ -578,7 +587,8 @@ export class FormApi {
         });
       } else {
         control = this.getControl(propertyName, undefined, false);
-        if (control && control instanceof FormControl) {
+        if (control) {
+          //control && control instanceof FormControl
           const history = (fieldChangeHistory[propertyName] || []).sort((a, b) => {
             const aTime = new Date(a.time).getTime();
             const bTime = new Date(b.time).getTime();
@@ -719,7 +729,8 @@ export class FormApi {
    * @date 2021/4/13 15:09
    */
   private setControlOptions(control: AbstractControl, key: string, data: any[], defaultVal?: any): void {
-    if (control && control instanceof FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr)
       storageOptions(control.controlAttr, data);
       this.setAttribute(key, Attribute.IsOptionType, OptionType.Fixed.code);
       this.setAttribute(key, Attribute.OptionConfig, data);
@@ -735,7 +746,8 @@ export class FormApi {
    * @date 2021/4/13 15:11
    */
   private setControlAttribute(control: AbstractControl, attribute: Attribute, data: any): void {
-    if (control && control instanceof FormControl && attribute) {
+    if (control && attribute) {
+      //control && control instanceof FormControl && attribute
       control.controlAttr[attribute] = data;
     }
   }

package/src/domain/FormConfig.ts

@@ -9,6 +9,7 @@ export interface FormConfig {
   loadMode?: LoadMode;
   appId?: string;
   onlySimpleLoadConfig?: boolean;
+  appIds?: string[];
   urls?: string[];
   dictUrls?: string[];
 }

package/src/services/form-tools.service.ts

@@ -1,4 +1,3 @@
-import Vue, { createApp } from "vue";
 import { FormConfig } from "../domain/FormConfig";
 import { FormRestfulResponse } from "../domain/FormRestfulResponse";
 import { DesForm } from "../domain/DesForm";
@@ -15,7 +14,7 @@ import { formStore } from "../store/form.store";
 import { DynamicOptionType } from "../constants/enum/dynamic-option-type.enum";
 import { dictStore } from "../store";
 import { SysDictInfo } from "../domain/SysDictInfo";
-import { DEFAULT_DICT_URL } from "../constants/config/form.config";
+import { DEFAULT_DICT_URL, DEFAULT_FORM_FILE_NAME } from "../constants/config/form.config";
 import { CacheType } from "../constants/enum/cache-type.enum";
 import { routerService } from "./router.service";
 import { FormApi } from "../core/FormApi";
@@ -96,8 +95,7 @@ class FormToolsService {
           this.desForms = forms;
           return Promise.resolve(FormToolsService.LOAD_SUCCESS);
         } else {
-          const url = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/query-cacheversion-by-appid-cachetype";
-          return this.loadDesign(url!, "static");
+          return this.loadDesign([this.formConfig.url || DEFAULT_FORM_FILE_NAME]);
         }
       } else if (this.formConfig.loadMode === "dynamic") {
         if (this.formConfig.appId != null && this.formConfig.appId !== "") {
@@ -110,7 +108,8 @@ class FormToolsService {
             if (res != null && res.code === 1) {
               if (res.data != null && res.data.desCacheVersion != null) {
                 if (String(formVersion) !== String(res.data.desCacheVersion.cacheVersionNumber)) {
-                  return this.loadDesign(res.data.desCacheVersion.storageAddress, "dynamic").then((resEx: FormRestfulResponse) => {
+                  const formUrl = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=" + res.data.desCacheVersion.storageAddress;
+                  return this.loadDesign([formUrl]).then((resEx: FormRestfulResponse) => {
                     if (resEx.code === 1) {
                       formStore.setVersion(res.data.desCacheVersion.cacheVersionNumber);
                     }
@@ -120,6 +119,7 @@ class FormToolsService {
                   if (forms != null) {
                     this.desForms = forms;
                   }
+                  console.log(this.desForms);
                   return Promise.resolve(FormToolsService.LOAD_SUCCESS);
                 }
               } else {
@@ -135,55 +135,91 @@ class FormToolsService {
             msg: "动态加载需指定当前系统编号(appId)",
           });
         }
+      } else if (this.formConfig.loadMode === "merge") {
+        if (this.formConfig.urls) {
+          return new Promise((resolve) => {
+            this.loadDesign(this.formConfig.urls || []).then(() => {
+              resolve(FormToolsService.LOAD_SUCCESS);
+            });
+          });
+        } else {
+          return this.mergeUrlByType(CacheType.FORM.code).then((response: any) => {
+            if (formVersion === response.cacheVersionNumber) {
+              if (forms) {
+                this.desForms = forms;
+              }
+              return Promise.resolve(FormToolsService.LOAD_SUCCESS);
+            } else {
+              return new Promise((resolve) => {
+                this.loadDesign(response.storageAddress).then(() => {
+                  formStore.setVersion(response.cacheVersionNumber);
+                  resolve(FormToolsService.LOAD_SUCCESS);
+                });
+              });
+            }
+          });
+        }
       }
       return Promise.resolve(FormToolsService.LOAD_FAIL);
     });
   }
 
+  /**
+   * @description: 获取表单或字典数据地址
+   * @author ZPFly
+   * @date 2022/10/18 20:43
+   */
+  private mergeUrlByType(type: string): Promise<any> {
+    const reqAddress: any = [];
+    const appIds = this.formConfig.appId?.split(",");
+    const url = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/query-cacheversion-by-appid-cachetype";
+    const downloadUrl = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=";
+    appIds?.forEach((appId: string) => {
+      const query = {
+        appId: appId,
+        cacheType: type,
+      };
+      reqAddress.push(this.fetch(url!, query));
+    });
+    return Promise.all(reqAddress).then((resp: any[]) => {
+      const response: any = {};
+      const address: string[] = [];
+      const cacheVersionNumber: any[] = [];
+      resp.forEach((res: any) => {
+        // 数据下载地址
+        if (res?.data?.desCacheVersion?.storageAddress) {
+          cacheVersionNumber.push(res.data.desCacheVersion.cacheVersionNumber);
+          address.push(downloadUrl + res.data.desCacheVersion.storageAddress);
+        }
+      });
+      response.cacheVersionNumber = cacheVersionNumber.join(",");
+      response.storageAddress = address;
+      return response;
+    });
+  }
+
   /**
    * @description: 加载远程表单配置
    * @author ChenRui
    * @date 2020/11/20 17:30
    */
-  private loadDesign(url: string, loadMode: string): Promise<FormRestfulResponse> {
-    const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
-    if (loadMode === "dynamic") {
-      const headers = this.createFileDownloadAuthorizationHeader();
-      url = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=" + url;
-      return this.fetch(url, {}, undefined, "GET", headers, onlySimpleLoadConfig).then((desForms) => {
-        const newDesForms: DesForm[] = [];
-        if (desForms != null && desForms.length > 0) {
-          desForms
-            .filter((item: any) => item.desFormLayouts != null && item.desFormLayouts.length > 0)
-            .forEach((item: any) => {
-              const newDesForm: DesForm | undefined = this.formatDesForm(item);
-              if (newDesForm != null) {
-                newDesForms.push(newDesForm);
-              }
-            });
-        }
-        this.desForms = newDesForms;
-        formStore.setForms(this.desForms);
-        return FormToolsService.LOAD_SUCCESS;
-      });
-    } else {
-      return this.mergeFetchDesign(url).then((desForms: DesForm[]) => {
-        const newDesForms: DesForm[] = [];
-        if (desForms != null && desForms.length > 0) {
-          desForms
-            .filter((item) => item.desFormLayouts != null && item.desFormLayouts.length > 0)
-            .forEach((item) => {
-              const newDesForm: DesForm | undefined = this.formatDesForm(item);
-              if (newDesForm != null) {
-                newDesForms.push(newDesForm);
-              }
-            });
-        }
-        this.desForms = newDesForms;
-        formStore.setForms(this.desForms);
-        return FormToolsService.LOAD_SUCCESS;
-      });
-    }
+  private loadDesign(urls: string[]): Promise<FormRestfulResponse> {
+    return this.mergeFetchDesign(urls).then((desForms: DesForm[]) => {
+      const newDesForms: DesForm[] = [];
+      if (desForms != null && desForms.length > 0) {
+        desForms
+          .filter((item) => item.desFormLayouts != null && item.desFormLayouts.length > 0)
+          .forEach((item) => {
+            const newDesForm: DesForm | undefined = this.formatDesForm(item);
+            if (newDesForm != null) {
+              newDesForms.push(newDesForm);
+            }
+          });
+      }
+      this.desForms = newDesForms;
+      formStore.setForms(this.desForms);
+      return FormToolsService.LOAD_SUCCESS;
+    });
   }
 
   /**
@@ -191,11 +227,12 @@ class FormToolsService {
    * @author ZPFly
    * @date 2022/10/17 15:39
    */
-  private mergeFetchDesign(url?: string) {
-    const urls: any = this.formConfig.urls || [url];
+  private mergeFetchDesign(urls: string[]) {
+    const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
+    const headers = this.createFileDownloadAuthorizationHeader();
     const fetches: any = [];
     urls.forEach((url: string) => {
-      fetches.push(this.fetch(url, {}, undefined, "GET", undefined, !!this.formConfig.onlySimpleLoadConfig));
+      fetches.push(this.fetch(url, {}, undefined, "GET", headers, onlySimpleLoadConfig));
     });
     return Promise.all(fetches).then((desForms: DesForm[]) => {
       let newDesForms: DesForm[] = [];
@@ -222,7 +259,7 @@ class FormToolsService {
           this.mapSysDictTreeDetailOptions = mapTreeDicts;
           return FormToolsService.LOAD_SUCCESS;
         } else {
-          return this.loadDict(url, "static");
+          return this.loadDict([url]);
         }
       } else if (this.formConfig.loadMode === "dynamic") {
         if (this.formConfig.appId) {
@@ -245,8 +282,9 @@ class FormToolsService {
                 if (res.data && res.data instanceof Array && res.data.length > 0) {
                   desCacheVersion = res.data[0].desCacheVersion;
                 }
+                const distUrl = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=" + desCacheVersion.storageAddress;
                 if (String(dictVersion) !== String(desCacheVersion.cacheVersionNumber)) {
-                  return this.loadDict(desCacheVersion.storageAddress, "dynamic").then((resEx: FormRestfulResponse) => {
+                  return this.loadDict([distUrl]).then((resEx: FormRestfulResponse) => {
                     if (resEx.code === 1) {
                       dictStore.setVersion(desCacheVersion.cacheVersionNumber);
                     }
@@ -271,6 +309,25 @@ class FormToolsService {
         } else {
           return { code: 0, msg: "动态加载需指定当前系统编号(appId)" };
         }
+      } else if (this.formConfig.loadMode === "merge") {
+        return this.mergeUrlByType(CacheType.DICT.code).then((response: any) => {
+          if (dictVersion === response.cacheVersionNumber) {
+            if (dicts != null || treeDicts != null) {
+              this.sysDictDetailOptions = dicts;
+              this.sysDictTreeDetailOptions = treeDicts;
+              this.mapSysDictDetailOptions = mapDicts;
+              this.mapSysDictTreeDetailOptions = mapTreeDicts;
+            }
+            return FormToolsService.LOAD_SUCCESS;
+          } else {
+            return new Promise((resolve) => {
+              this.loadDict(response.storageAddress).then(() => {
+                formStore.setVersion(response.cacheVersionNumber);
+                resolve(FormToolsService.LOAD_SUCCESS);
+              });
+            });
+          }
+        });
       }
       return FormToolsService.LOAD_FAIL;
     });
@@ -281,55 +338,54 @@ class FormToolsService {
    * @author ChenRui
    * @date 2020/11/20 17:30
    */
-  private loadDict(url: string, loadMode: string): Promise<FormRestfulResponse> {
-    const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
-    let sysDictInfos: SysDictInfo[] = [];
-    if (loadMode === "dynamic") {
-      const headers = this.createFileDownloadAuthorizationHeader();
-      url = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=" + url;
-      return this.fetch(url, {}, undefined, "GET", headers, onlySimpleLoadConfig).then((res: any) => {
-        sysDictInfos = res;
-        if (sysDictInfos != null && sysDictInfos.length > 0) {
-          // 数据格式化
-          const dictionaryFormatCollection: DictionaryFormatCollection = this.inidDictOptions(sysDictInfos);
-          this.sysDictDetailOptions = dictionaryFormatCollection.sysDictDetailOptions || [];
-          this.sysDictTreeDetailOptions = dictionaryFormatCollection.sysDictTreeDetailOptions || [];
-          this.mapSysDictDetailOptions = dictionaryFormatCollection.mapSysDictDetailOptions;
-          this.mapSysDictTreeDetailOptions = dictionaryFormatCollection.mapSysDictTreeDetailOptions;
-          // 字典本地存储
-          if (dictionaryFormatCollection.sysDictDetailOptions && dictionaryFormatCollection.sysDictDetailOptions.length > 0) {
-            dictStore.setDicts(dictionaryFormatCollection.sysDictDetailOptions);
-          }
-          if (dictionaryFormatCollection.sysDictTreeDetailOptions && dictionaryFormatCollection.sysDictTreeDetailOptions.length > 0) {
-            dictStore.setTreeDicts(dictionaryFormatCollection.sysDictTreeDetailOptions);
-          }
-          dictStore.setMapDicts(dictionaryFormatCollection.mapSysDictDetailOptions || null);
-          dictStore.setMapTreeDicts(dictionaryFormatCollection.mapSysDictTreeDetailOptions || null);
+  private loadDict(urls: string[]): Promise<FormRestfulResponse> {
+    return this.mergeFetchDict(urls).then((sysDictInfos: any) => {
+      if (sysDictInfos != null) {
+        // 数据格式化
+        const dictionaryFormatCollection: DictionaryFormatCollection = this.inidDictOptions(sysDictInfos);
+        this.sysDictDetailOptions = dictionaryFormatCollection.sysDictDetailOptions || [];
+        this.sysDictTreeDetailOptions = dictionaryFormatCollection.sysDictTreeDetailOptions || [];
+        this.mapSysDictDetailOptions = dictionaryFormatCollection.mapSysDictDetailOptions;
+        this.mapSysDictTreeDetailOptions = dictionaryFormatCollection.mapSysDictTreeDetailOptions;
+        // 字典本地存储
+        if (dictionaryFormatCollection.sysDictDetailOptions && dictionaryFormatCollection.sysDictDetailOptions.length > 0) {
+          dictStore.setDicts(dictionaryFormatCollection.sysDictDetailOptions);
         }
-        return FormToolsService.LOAD_SUCCESS;
-      });
-    } else {
-      return this.mergeFetchDict(url).then((sysDictInfos: any) => {
-        if (sysDictInfos != null) {
-          // 数据格式化
-          const dictionaryFormatCollection: DictionaryFormatCollection = this.inidDictOptions(sysDictInfos);
-          this.sysDictDetailOptions = dictionaryFormatCollection.sysDictDetailOptions || [];
-          this.sysDictTreeDetailOptions = dictionaryFormatCollection.sysDictTreeDetailOptions || [];
-          this.mapSysDictDetailOptions = dictionaryFormatCollection.mapSysDictDetailOptions;
-          this.mapSysDictTreeDetailOptions = dictionaryFormatCollection.mapSysDictTreeDetailOptions;
-          // 字典本地存储
-          if (dictionaryFormatCollection.sysDictDetailOptions && dictionaryFormatCollection.sysDictDetailOptions.length > 0) {
-            dictStore.setDicts(dictionaryFormatCollection.sysDictDetailOptions);
-          }
-          if (dictionaryFormatCollection.sysDictTreeDetailOptions && dictionaryFormatCollection.sysDictTreeDetailOptions.length > 0) {
-            dictStore.setTreeDicts(dictionaryFormatCollection.sysDictTreeDetailOptions);
-          }
-          dictStore.setMapDicts(dictionaryFormatCollection.mapSysDictDetailOptions || null);
-          dictStore.setMapTreeDicts(dictionaryFormatCollection.mapSysDictTreeDetailOptions || null);
+        if (dictionaryFormatCollection.sysDictTreeDetailOptions && dictionaryFormatCollection.sysDictTreeDetailOptions.length > 0) {
+          dictStore.setTreeDicts(dictionaryFormatCollection.sysDictTreeDetailOptions);
         }
-        return FormToolsService.LOAD_SUCCESS;
-      });
-    }
+        dictStore.setMapDicts(dictionaryFormatCollection.mapSysDictDetailOptions || null);
+        dictStore.setMapTreeDicts(dictionaryFormatCollection.mapSysDictTreeDetailOptions || null);
+      }
+      return FormToolsService.LOAD_SUCCESS;
+    });
+    // const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
+    // let sysDictInfos: SysDictInfo[] = [];
+    // if (loadMode === "dynamic") {
+    //   const headers = this.createFileDownloadAuthorizationHeader();
+    //   url = this.formConfig.url + "/ms-loong/api/v1/des-cache-info/permit_endpoint/download?storageAddress=" + url;
+    //   return this.fetch(url, {}, undefined, "GET", headers, onlySimpleLoadConfig).then((res: any) => {
+    //     sysDictInfos = res;
+    //     if (sysDictInfos != null && sysDictInfos.length > 0) {
+    //       // 数据格式化
+    //       const dictionaryFormatCollection: DictionaryFormatCollection = this.inidDictOptions(sysDictInfos);
+    //       this.sysDictDetailOptions = dictionaryFormatCollection.sysDictDetailOptions || [];
+    //       this.sysDictTreeDetailOptions = dictionaryFormatCollection.sysDictTreeDetailOptions || [];
+    //       this.mapSysDictDetailOptions = dictionaryFormatCollection.mapSysDictDetailOptions;
+    //       this.mapSysDictTreeDetailOptions = dictionaryFormatCollection.mapSysDictTreeDetailOptions;
+    //       // 字典本地存储
+    //       if (dictionaryFormatCollection.sysDictDetailOptions && dictionaryFormatCollection.sysDictDetailOptions.length > 0) {
+    //         dictStore.setDicts(dictionaryFormatCollection.sysDictDetailOptions);
+    //       }
+    //       if (dictionaryFormatCollection.sysDictTreeDetailOptions && dictionaryFormatCollection.sysDictTreeDetailOptions.length > 0) {
+    //         dictStore.setTreeDicts(dictionaryFormatCollection.sysDictTreeDetailOptions);
+    //       }
+    //       dictStore.setMapDicts(dictionaryFormatCollection.mapSysDictDetailOptions || null);
+    //       dictStore.setMapTreeDicts(dictionaryFormatCollection.mapSysDictTreeDetailOptions || null);
+    //     }
+    //     return FormToolsService.LOAD_SUCCESS;
+    //   });
+    // }
   }
 
   /**
@@ -337,10 +393,9 @@ class FormToolsService {
    * @author ZPFly
    * @date 2022/10/17 15:39
    */
-  private mergeFetchDict(dictUrl?: string) {
-    const urls: any = this.formConfig.dictUrls || [dictUrl];
+  private mergeFetchDict(dictUrl: string[]) {
     const fetchDicts: any = [];
-    urls.forEach((url: string) => {
+    dictUrl.forEach((url: string) => {
       fetchDicts.push(this.fetch(url, {}, undefined, "GET", undefined, !!this.formConfig.onlySimpleLoadConfig));
     });
     return Promise.all(fetchDicts).then((dictInfos: SysDictInfo[]) => {

package/types/domain/FormConfig.d.ts

@@ -9,6 +9,7 @@ export interface FormConfig {
     loadMode?: LoadMode;
     appId?: string;
     onlySimpleLoadConfig?: boolean;
+    appIds?: string[];
     urls?: string[];
     dictUrls?: string[];
 }

package/types/services/form-tools.service.d.ts

@@ -44,6 +44,12 @@ declare class FormToolsService {
      * @date 2020/11/20 10:55
      */
     initDesign(): Promise<FormRestfulResponse>;
+    /**
+     * @description: 获取表单或字典数据地址
+     * @author ZPFly
+     * @date 2022/10/18 20:43
+     */
+    private mergeUrlByType;
     /**
      * @description: 加载远程表单配置
      * @author ChenRui