@dhccmobile/vue3-lo-form 1.0.2 → 1.0.3

package/dist/vue3-lo-form.umd.js

@@ -227,6 +227,17 @@ module.exports = function (argument) {
 };
 
 
+/***/ }),
+
+/***/ "123b":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_751c673b_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("cf16");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_751c673b_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_751c673b_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "13d2":
@@ -10354,17 +10365,6 @@ module.exports = SPECIAL_DOCUMENT_ALL ? function (it) {
 };
 
 
-/***/ }),
-
-/***/ "8774":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_570608da_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("9ef9");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_570608da_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_570608da_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "8925":
@@ -10587,10 +10587,14 @@ const FormFieldClass = {
 
 /***/ }),
 
-/***/ "9ef9":
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "9f1a":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_5311b22e_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("ba77");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_5311b22e_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvForm_vue_vue_type_style_index_0_id_5311b22e_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
 
-// extracted by mini-css-extract-plugin
 
 /***/ }),
 
@@ -13535,13 +13539,6 @@ module.exports = DESCRIPTORS && fails(function () {
 });
 
 
-/***/ }),
-
-/***/ "b00e":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "b20f":
@@ -13614,6 +13611,13 @@ module.exports = !fails(function () {
 });
 
 
+/***/ }),
+
+/***/ "ba77":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "c04e":
@@ -19762,6 +19766,13 @@ var WeakMap = global.WeakMap;
 module.exports = isCallable(WeakMap) && /native code/.test(String(WeakMap));
 
 
+/***/ }),
+
+/***/ "cf16":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "d012":
@@ -24094,17 +24105,6 @@ module.exports = TO_STRING_TAG_SUPPORT ? classofRaw : function (it) {
 };
 
 
-/***/ }),
-
-/***/ "f61a":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_323bdcb5_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("b00e");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_323bdcb5_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_9_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_9_oneOf_1_1_node_modules_vue_loader_v16_dist_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_9_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_9_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_v16_dist_index_js_ref_1_1_DvFormLayout_vue_vue_type_style_index_0_id_323bdcb5_lang_scss_scoped_true__WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "f70e":
@@ -24214,15 +24214,16 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/form/DvForm.vue?vue&type=template&id=570608da&scoped=true&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/form/DvForm.vue?vue&type=template&id=5311b22e&scoped=true&ts=true
 
-function DvFormvue_type_template_id_570608da_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function DvFormvue_type_template_id_5311b22e_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   var _ctx$desForm, _ctx$desForm$controls;
 
   const _component_dv_form_layout = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("dv-form-layout");
 
   return (_ctx$desForm = _ctx.desForm) !== null && _ctx$desForm !== void 0 && (_ctx$desForm$controls = _ctx$desForm.controls) !== null && _ctx$desForm$controls !== void 0 && _ctx$desForm$controls.length ? (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])("div", {
     key: 0,
+    ref: "formView",
     class: Object(external_commonjs_vue_commonjs2_vue_root_Vue_["normalizeClass"])('lo-form-container ' + ('lo-' + (_ctx.edit ? 'enable' : 'disable') + '-edit') + ' lo-class-style-' + _ctx.styleMode)
   }, [(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(true), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createElementBlock"])(external_commonjs_vue_commonjs2_vue_root_Vue_["Fragment"], null, Object(external_commonjs_vue_commonjs2_vue_root_Vue_["renderList"])(_ctx.desForm.controls, (item, i) => {
     return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["openBlock"])(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createBlock"])(_component_dv_form_layout, {
@@ -24251,7 +24252,7 @@ function DvFormvue_type_template_id_570608da_scoped_true_ts_true_render(_ctx, _c
     })]), 1032, ["control", "customFormats", "index"]);
   }), 128))], 2)) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true);
 }
-// CONCATENATED MODULE: ./src/components/form/DvForm.vue?vue&type=template&id=570608da&scoped=true&ts=true
+// CONCATENATED MODULE: ./src/components/form/DvForm.vue?vue&type=template&id=5311b22e&scoped=true&ts=true
 
 // CONCATENATED MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 function _defineProperty(obj, key, value) {
@@ -24488,10 +24489,10 @@ function __classPrivateFieldSet(receiver, privateMap, value) {
     return value;
 }
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/form/DvFormLayout.vue?vue&type=template&id=323bdcb5&scoped=true&ts=true
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--15-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/ts-loader??ref--15-3!./node_modules/vue-loader-v16/dist/templateLoader.js??ref--7!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader-v16/dist??ref--1-1!./src/components/form/DvFormLayout.vue?vue&type=template&id=751c673b&scoped=true&ts=true
 
 
-const _withScopeId = n => (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["pushScopeId"])("data-v-323bdcb5"), n = n(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["popScopeId"])(), n);
+const _withScopeId = n => (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["pushScopeId"])("data-v-751c673b"), n = n(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["popScopeId"])(), n);
 
 const _hoisted_1 = {
   class: "lo-control-box"
@@ -24530,7 +24531,7 @@ const _hoisted_12 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root
 const _hoisted_13 = /*#__PURE__*/Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createTextVNode"])(" 选择文件 ");
 
 const _hoisted_14 = ["title"];
-function DvFormLayoutvue_type_template_id_323bdcb5_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
+function DvFormLayoutvue_type_template_id_751c673b_scoped_true_ts_true_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_tooltip = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("a-tooltip");
 
   const _component_question_circle_outlined = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])("question-circle-outlined");
@@ -25105,7 +25106,7 @@ function DvFormLayoutvue_type_template_id_323bdcb5_scoped_true_ts_true_render(_c
     _: 3
   }, 8, ["class", "layout", "style"])) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])("", true);
 }
-// CONCATENATED MODULE: ./src/components/form/DvFormLayout.vue?vue&type=template&id=323bdcb5&scoped=true&ts=true
+// CONCATENATED MODULE: ./src/components/form/DvFormLayout.vue?vue&type=template&id=751c673b&scoped=true&ts=true
 
 // CONCATENATED MODULE: ./node_modules/vue-class-component/dist/vue-class-component.esm-bundler.js
 /**
@@ -82037,8 +82038,7 @@ class form_tools_service_FormToolsService {
           this.desForms = forms;
           return Promise.resolve(form_tools_service_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 !== "") {
@@ -82051,7 +82051,8 @@ class form_tools_service_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 => {
+                  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 => {
                     if (resEx.code === 1) {
                       formStore.setVersion(res.data.desCacheVersion.cacheVersionNumber);
                     }
@@ -82063,6 +82064,7 @@ class form_tools_service_FormToolsService {
                     this.desForms = forms;
                   }
 
+                  console.log(this.desForms);
                   return Promise.resolve(form_tools_service_FormToolsService.LOAD_SUCCESS);
                 }
               } else {
@@ -82081,60 +82083,100 @@ class form_tools_service_FormToolsService {
             msg: "动态加载需指定当前系统编号(appId)"
           });
         }
+      } else if (this.formConfig.loadMode === "merge") {
+        if (this.formConfig.urls) {
+          return new Promise(resolve => {
+            this.loadDesign(this.formConfig.urls || []).then(() => {
+              resolve(form_tools_service_FormToolsService.LOAD_SUCCESS);
+            });
+          });
+        } else {
+          return this.mergeUrlByType(cache_type_enum["a" /* CacheType */].FORM.code).then(response => {
+            if (formVersion === response.cacheVersionNumber) {
+              if (forms) {
+                this.desForms = forms;
+              }
+
+              return Promise.resolve(form_tools_service_FormToolsService.LOAD_SUCCESS);
+            } else {
+              return new Promise(resolve => {
+                this.loadDesign(response.storageAddress).then(() => {
+                  formStore.setVersion(response.cacheVersionNumber);
+                  resolve(form_tools_service_FormToolsService.LOAD_SUCCESS);
+                });
+              });
+            }
+          });
+        }
       }
 
       return Promise.resolve(form_tools_service_FormToolsService.LOAD_FAIL);
     });
   }
   /**
-   * @description: 加载远程表单配置
-   * @author ChenRui
-   * @date 2020/11/20 17:30
+   * @description: 获取表单或字典数据地址
+   * @author ZPFly
+   * @date 2022/10/18 20:43
    */
 
 
-  loadDesign(url, loadMode) {
-    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 = [];
+  mergeUrlByType(type) {
+    var _this$formConfig$appI;
 
-        if (desForms != null && desForms.length > 0) {
-          desForms.filter(item => item.desFormLayouts != null && item.desFormLayouts.length > 0).forEach(item => {
-            const newDesForm = this.formatDesForm(item);
+    const reqAddress = [];
+    const appIds = (_this$formConfig$appI = this.formConfig.appId) === null || _this$formConfig$appI === void 0 ? void 0 : _this$formConfig$appI.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 === null || appIds === void 0 ? void 0 : appIds.forEach(appId => {
+      const query = {
+        appId: appId,
+        cacheType: type
+      };
+      reqAddress.push(this.fetch(url, query));
+    });
+    return Promise.all(reqAddress).then(resp => {
+      const response = {};
+      const address = [];
+      const cacheVersionNumber = [];
+      resp.forEach(res => {
+        var _res$data, _res$data$desCacheVer;
 
-            if (newDesForm != null) {
-              newDesForms.push(newDesForm);
-            }
-          });
+        // 数据下载地址
+        if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$desCacheVer = _res$data.desCacheVersion) !== null && _res$data$desCacheVer !== void 0 && _res$data$desCacheVer.storageAddress) {
+          cacheVersionNumber.push(res.data.desCacheVersion.cacheVersionNumber);
+          address.push(downloadUrl + res.data.desCacheVersion.storageAddress);
         }
-
-        this.desForms = newDesForms;
-        formStore.setForms(this.desForms);
-        return form_tools_service_FormToolsService.LOAD_SUCCESS;
       });
-    } else {
-      return this.mergeFetchDesign(url).then(desForms => {
-        const newDesForms = [];
+      response.cacheVersionNumber = cacheVersionNumber.join(",");
+      response.storageAddress = address;
+      return response;
+    });
+  }
+  /**
+   * @description: 加载远程表单配置
+   * @author ChenRui
+   * @date 2020/11/20 17:30
+   */
 
-        if (desForms != null && desForms.length > 0) {
-          desForms.filter(item => item.desFormLayouts != null && item.desFormLayouts.length > 0).forEach(item => {
-            const newDesForm = this.formatDesForm(item);
 
-            if (newDesForm != null) {
-              newDesForms.push(newDesForm);
-            }
-          });
-        }
+  loadDesign(urls) {
+    return this.mergeFetchDesign(urls).then(desForms => {
+      const newDesForms = [];
 
-        this.desForms = newDesForms;
-        formStore.setForms(this.desForms);
-        return form_tools_service_FormToolsService.LOAD_SUCCESS;
-      });
-    }
+      if (desForms != null && desForms.length > 0) {
+        desForms.filter(item => item.desFormLayouts != null && item.desFormLayouts.length > 0).forEach(item => {
+          const newDesForm = this.formatDesForm(item);
+
+          if (newDesForm != null) {
+            newDesForms.push(newDesForm);
+          }
+        });
+      }
+
+      this.desForms = newDesForms;
+      formStore.setForms(this.desForms);
+      return form_tools_service_FormToolsService.LOAD_SUCCESS;
+    });
   }
   /**
    * @description: 合并多个应用表单
@@ -82143,11 +82185,12 @@ class form_tools_service_FormToolsService {
    */
 
 
-  mergeFetchDesign(url) {
-    const urls = this.formConfig.urls || [url];
+  mergeFetchDesign(urls) {
+    const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
+    const headers = this.createFileDownloadAuthorizationHeader();
     const fetches = [];
     urls.forEach(url => {
-      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 => {
       let newDesForms = [];
@@ -82176,7 +82219,7 @@ class form_tools_service_FormToolsService {
           this.mapSysDictTreeDetailOptions = mapTreeDicts;
           return form_tools_service_FormToolsService.LOAD_SUCCESS;
         } else {
-          return this.loadDict(url, "static");
+          return this.loadDict([url]);
         }
       } else if (this.formConfig.loadMode === "dynamic") {
         if (this.formConfig.appId) {
@@ -82203,8 +82246,10 @@ class form_tools_service_FormToolsService {
                   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 => {
+                  return this.loadDict([distUrl]).then(resEx => {
                     if (resEx.code === 1) {
                       dictStore.setVersion(desCacheVersion.cacheVersionNumber);
                     }
@@ -82237,6 +82282,26 @@ class form_tools_service_FormToolsService {
             msg: "动态加载需指定当前系统编号(appId)"
           };
         }
+      } else if (this.formConfig.loadMode === "merge") {
+        return this.mergeUrlByType(cache_type_enum["a" /* CacheType */].DICT.code).then(response => {
+          if (dictVersion === response.cacheVersionNumber) {
+            if (dicts != null || treeDicts != null) {
+              this.sysDictDetailOptions = dicts;
+              this.sysDictTreeDetailOptions = treeDicts;
+              this.mapSysDictDetailOptions = mapDicts;
+              this.mapSysDictTreeDetailOptions = mapTreeDicts;
+            }
+
+            return form_tools_service_FormToolsService.LOAD_SUCCESS;
+          } else {
+            return new Promise(resolve => {
+              this.loadDict(response.storageAddress).then(() => {
+                formStore.setVersion(response.cacheVersionNumber);
+                resolve(form_tools_service_FormToolsService.LOAD_SUCCESS);
+              });
+            });
+          }
+        });
       }
 
       return form_tools_service_FormToolsService.LOAD_FAIL;
@@ -82249,63 +82314,56 @@ class form_tools_service_FormToolsService {
    */
 
 
-  loadDict(url, loadMode) {
-    const onlySimpleLoadConfig = !!this.formConfig.onlySimpleLoadConfig;
-    let sysDictInfos = [];
-
-    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 => {
-        sysDictInfos = res;
-
-        if (sysDictInfos != null && sysDictInfos.length > 0) {
-          // 数据格式化
-          const 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 form_tools_service_FormToolsService.LOAD_SUCCESS;
-      });
-    } else {
-      return this.mergeFetchDict(url).then(sysDictInfos => {
-        if (sysDictInfos != null) {
-          // 数据格式化
-          const 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 form_tools_service_FormToolsService.LOAD_SUCCESS;
-      });
-    }
+  loadDict(urls) {
+    return this.mergeFetchDict(urls).then(sysDictInfos => {
+      if (sysDictInfos != null) {
+        // 数据格式化
+        const 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 form_tools_service_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;
+    //   });
+    // }
   }
   /**
    * @description: 合并多个应用字典
@@ -82315,9 +82373,8 @@ class form_tools_service_FormToolsService {
 
 
   mergeFetchDict(dictUrl) {
-    const urls = this.formConfig.dictUrls || [dictUrl];
     const fetchDicts = [];
-    urls.forEach(url => {
+    dictUrl.forEach(url => {
       fetchDicts.push(this.fetch(url, {}, undefined, "GET", undefined, !!this.formConfig.onlySimpleLoadConfig));
     });
     return Promise.all(fetchDicts).then(dictInfos => {
@@ -84910,8 +84967,8 @@ DvFormLayoutvue_type_script_lang_ts_DvFormLayout = __decorate([Options({
 /* harmony default export */ var DvFormLayoutvue_type_script_lang_ts = (DvFormLayoutvue_type_script_lang_ts_DvFormLayout);
 // CONCATENATED MODULE: ./src/components/form/DvFormLayout.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./src/components/form/DvFormLayout.vue?vue&type=style&index=0&id=323bdcb5&lang=scss&scoped=true
-var DvFormLayoutvue_type_style_index_0_id_323bdcb5_lang_scss_scoped_true = __webpack_require__("f61a");
+// EXTERNAL MODULE: ./src/components/form/DvFormLayout.vue?vue&type=style&index=0&id=751c673b&lang=scss&scoped=true
+var DvFormLayoutvue_type_style_index_0_id_751c673b_lang_scss_scoped_true = __webpack_require__("123b");
 
 // CONCATENATED MODULE: ./src/components/form/DvFormLayout.vue
 
@@ -84921,7 +84978,7 @@ var DvFormLayoutvue_type_style_index_0_id_323bdcb5_lang_scss_scoped_true = __web
 
 
 
-const DvFormLayout_exports_ = /*#__PURE__*/exportHelper_default()(DvFormLayoutvue_type_script_lang_ts, [['render',DvFormLayoutvue_type_template_id_323bdcb5_scoped_true_ts_true_render],['__scopeId',"data-v-323bdcb5"]])
+const DvFormLayout_exports_ = /*#__PURE__*/exportHelper_default()(DvFormLayoutvue_type_script_lang_ts, [['render',DvFormLayoutvue_type_template_id_751c673b_scoped_true_ts_true_render],['__scopeId',"data-v-751c673b"]])
 
 /* harmony default export */ var form_DvFormLayout = (DvFormLayout_exports_);
 // CONCATENATED MODULE: ./src/services/date-format.service.ts
@@ -85285,7 +85342,8 @@ class FormApi_FormApi {
   getText(key) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.text();
     }
 
@@ -85301,7 +85359,8 @@ class FormApi_FormApi {
   getOptions(key) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr
       return extractOptions(control.controlAttr);
     }
 
@@ -85336,7 +85395,8 @@ class FormApi_FormApi {
   getAttribute(key, attribute) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr
       return control.controlAttr[attribute];
     }
   }
@@ -85369,7 +85429,8 @@ class FormApi_FormApi {
   getValidate(key, name) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.getValidate(name);
     }
   }
@@ -85383,7 +85444,8 @@ class FormApi_FormApi {
   removeValidate(key, validateName) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       const validates = control.validates;
 
       if (validates && validates.length > 0) {
@@ -85405,7 +85467,8 @@ class FormApi_FormApi {
   removeAllValidates(key) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       control.validates = [];
     }
   }
@@ -85419,7 +85482,8 @@ class FormApi_FormApi {
   getValidates(key) {
     const control = this.getControl(key);
 
-    if (control && control instanceof FormControl_FormControl) {
+    if (control) {
+      //control && control instanceof FormControl
       return control.validates;
     }
 
@@ -85456,7 +85520,8 @@ class FormApi_FormApi {
       setTimeout(() => {
         control = this.getControl(key);
 
-        if (control && control instanceof FormControl_FormControl) {
+        if (control) {
+          //control && control instanceof FormControl
           this.setValidateInner(control, validate, isCover);
         }
       });
@@ -85669,7 +85734,8 @@ class FormApi_FormApi {
         setTimeout(() => {
           control = this.getControl(propertyName, undefined, false);
 
-          if (control && control instanceof FormControl_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();
@@ -85681,7 +85747,8 @@ class FormApi_FormApi {
       } else {
         control = this.getControl(propertyName, undefined, false);
 
-        if (control && control instanceof FormControl_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();
@@ -85850,7 +85917,8 @@ class FormApi_FormApi {
 
 
   setControlOptions(control, key, data, defaultVal) {
-    if (control && control instanceof FormControl_FormControl && control.controlAttr) {
+    if (control && control.controlAttr) {
+      //control && control instanceof FormControl && control.controlAttr)
       storageOptions(control.controlAttr, data);
       this.setAttribute(key, Attribute.IsOptionType, constants_enum["k" /* OptionType */].Fixed.code);
       this.setAttribute(key, Attribute.OptionConfig, data);
@@ -85868,7 +85936,8 @@ class FormApi_FormApi {
 
 
   setControlAttribute(control, attribute, data) {
-    if (control && control instanceof FormControl_FormControl && attribute) {
+    if (control && attribute) {
+      //control && control instanceof FormControl && attribute
       control.controlAttr[attribute] = data;
     }
   }
@@ -86507,6 +86576,24 @@ let DvFormvue_type_script_lang_ts_DyForm = class DyForm extends Vue {
       }
 
       this.$emit("complete");
+      this.$nextTick(() => {
+        try {
+          const formView = 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);
+        }
+      });
     }
   }
   /**
@@ -86933,8 +87020,8 @@ DvFormvue_type_script_lang_ts_DyForm = __decorate([Options({
 /* harmony default export */ var DvFormvue_type_script_lang_ts = (DvFormvue_type_script_lang_ts_DyForm);
 // CONCATENATED MODULE: ./src/components/form/DvForm.vue?vue&type=script&lang=ts
  
-// EXTERNAL MODULE: ./src/components/form/DvForm.vue?vue&type=style&index=0&id=570608da&lang=scss&scoped=true
-var DvFormvue_type_style_index_0_id_570608da_lang_scss_scoped_true = __webpack_require__("8774");
+// EXTERNAL MODULE: ./src/components/form/DvForm.vue?vue&type=style&index=0&id=5311b22e&lang=scss&scoped=true
+var DvFormvue_type_style_index_0_id_5311b22e_lang_scss_scoped_true = __webpack_require__("9f1a");
 
 // CONCATENATED MODULE: ./src/components/form/DvForm.vue
 
@@ -86944,7 +87031,7 @@ var DvFormvue_type_style_index_0_id_570608da_lang_scss_scoped_true = __webpack_r
 
 
 
-const DvForm_exports_ = /*#__PURE__*/exportHelper_default()(DvFormvue_type_script_lang_ts, [['render',DvFormvue_type_template_id_570608da_scoped_true_ts_true_render],['__scopeId',"data-v-570608da"]])
+const DvForm_exports_ = /*#__PURE__*/exportHelper_default()(DvFormvue_type_script_lang_ts, [['render',DvFormvue_type_template_id_5311b22e_scoped_true_ts_true_render],['__scopeId',"data-v-5311b22e"]])
 
 /* harmony default export */ var DvForm = (DvForm_exports_);
 // EXTERNAL MODULE: ./node_modules/decimal.js/decimal.js