@dhccmobile/vue3-lo-form 2.0.52 → 2.0.55

package/package.json

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

package/src/components/form/DvForm.vue

@@ -184,8 +184,10 @@ export default class DyForm extends Vue {
    */
   private initDesForm(): void {
     if (this.formId != null && this.formId !== "") {
-      this.desForm = formToolsService.loadResource(this.formId);
-      this.formatDesForm();
+      formToolsService.initResource(this.formId).then((form: any) => {
+        this.desForm = form;
+        this.formatDesForm();
+      });
     }
   }
 

package/src/components/form/DvFormLayout.vue

@@ -302,9 +302,7 @@
             </a-upload>
           </template>
           <template v-if="control.code === formFieldType.Custom.code && controlAttr.customFieldName">
-            <div class="custom-border">
-              <slot :control="control" :onChange="onChange" :name="controlAttr.customFieldName"></slot>
-            </div>
+            <slot :control="control" :onChange="onChange" :name="controlAttr.customFieldName"></slot>
           </template>
         </template>
         <template v-else>

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

@@ -702,6 +702,34 @@ class FormToolsService {
     }
   }
 
+  initResource(formId: string): Promise<void | DesForm> {
+    if (this.desForms.length === 0) {
+      return new Promise((resolve, reject) => {
+        Promise.all([dictStore.getDicts(), dictStore.getTreeDicts(), dictStore.getMapDicts(), dictStore.getMapTreeDicts(), formStore.getForms()]).then(([dicts, treeDicts, mapDicts, mapTreeDicts, forms]: any[]) => {
+          this.desForms = forms;
+          this.sysDictDetailOptions = dicts;
+          this.sysDictTreeDetailOptions = treeDicts;
+          this.mapSysDictDetailOptions = mapDicts;
+          this.mapSysDictTreeDetailOptions = mapTreeDicts;
+          const desForm: DesForm | undefined = this.desForms.find((item) => item.formId === formId);
+          if (desForm != null) {
+            resolve(formBeanUtilsService.copy(desForm));
+            return formBeanUtilsService.copy(desForm);
+          } else {
+            reject(new DesForm({ formId: formId }));
+          }
+        });
+      });
+    } else {
+      const desForm: DesForm | undefined = this.desForms.find((item) => item.formId === formId);
+      if (desForm != null) {
+        return Promise.resolve(formBeanUtilsService.copy(desForm));
+      } else {
+        return Promise.reject(new DesForm({ formId: formId }));
+      }
+    }
+  }
+
   /**
    * @description: rest客户端
    * @author ChenRui

package/src/styles/index.scss

@@ -193,6 +193,7 @@
 .ant-select-arrow {
   z-index: 10;
 }
+/** 下拉框占位符的样式 */
 .ant-select-selection-placeholder {
   display: flex !important;
   align-items: center !important;

package/src/styles/theme-4.scss

@@ -379,12 +379,6 @@
 .ant-input-textarea {
   width: 100%;
 }
-.custom-border {
-  width: 100%;
-  min-height: 40px;
-  border-radius: .5rem;
-  border: 1px #e1e2e4 solid;
-}
 .lo-theme-textarea-box {
   min-height: 81px !important;
   :deep .ant-input {
@@ -399,4 +393,3 @@
     }
   }
 }
-

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

@@ -125,6 +125,7 @@ declare class FormToolsService {
      * @date 2020/11/23 11:00
      */
     loadResource(formId: string): DesForm;
+    initResource(formId: string): Promise<void | DesForm>;
     /**
      * @description: rest客户端
      * @author ChenRui