cloud-web-corejs 1.0.54-dev.667 → 1.0.54-dev.669

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.667",
+  "version": "1.0.54-dev.669",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/vue-page-widget.vue

@@ -21,9 +21,13 @@
       </div>
     </div>
     <div v-else class="vue-page-container" :style="containerStyle">
-      <div v-if="!componentPath" class="vue-page-placeholder">{{ $t1("请配置 Vue 页面路径") }}</div>
+      <div v-if="!componentPath" class="vue-page-placeholder">
+        {{ $t1("请配置 Vue 页面路径") }}
+      </div>
       <div v-else-if="loadError" class="vue-page-error">{{ loadError }}</div>
-      <div v-else-if="loading" class="vue-page-loading">{{ $t1("页面加载中...") }}</div>
+      <div v-else-if="loading" class="vue-page-loading">
+        {{ $t1("页面加载中...") }}
+      </div>
       <component
         v-if="showComponent && dynamicComponent"
         :is="dynamicComponent"
@@ -80,7 +84,6 @@ export default {
       dynamicComponent: null,
       componentProps: {},
       componentRenderKey: 0,
-      componentLoaded: false,
       loading: false,
       loadError: null,
     };
@@ -101,25 +104,10 @@ export default {
       };
     },
   },
-  watch: {
-    componentPath() {
-      this.reloadDynamicComponent();
-    },
-    "field.options.componentConfig"() {
-      this.updateComponentProps();
-    },
-    formModel: {
-      deep: true,
-      handler() {
-        this.updateComponentProps();
-      },
-    },
-  },
   created() {
     this.registerToRefList();
     this.initEventHandler();
     this.handleOnCreated();
-    this.loadPage();
   },
   mounted() {
     this.handleOnMounted();
@@ -135,54 +123,48 @@ export default {
       this.showComponent = false;
       this.dynamicComponent = null;
       this.componentProps = {};
-      this.componentLoaded = false;
       this.loading = false;
       this.loadError = null;
     },
-    reloadDynamicComponent() {
-      this.resetComponentState();
-      this.loadPage();
-    },
     loadPage() {
       if (this.designState) {
         return;
       }
 
+      const path = this.normalizeComponentPath(this.componentPath);
+      if (!path) {
+        this.resetComponentState();
+        return;
+      }
+
       if (this.dynamicComponent) {
-        this.showComponent = true;
         this.updateComponentProps();
+        this.showComponent = true;
         return;
       }
 
-      const path = this.normalizeComponentPath(this.componentPath);
       this.showComponent = false;
       this.loadError = null;
-
-      if (!path) {
-        this.loading = false;
-        this.componentLoaded = false;
-        return;
-      }
-
       this.loading = true;
+
       try {
         const loader = loadView(path);
         loader((component) => {
+          if (path !== this.normalizeComponentPath(this.componentPath)) {
+            return;
+          }
           this.loading = false;
           if (!component) {
             this.loadError = this.$t1("页面组件未找到");
-            this.componentLoaded = false;
             return;
           }
           this.dynamicComponent = component.default || component;
           this.componentRenderKey += 1;
-          this.componentLoaded = true;
-          this.showComponent = true;
           this.updateComponentProps();
+          this.showComponent = true;
         });
       } catch (error) {
         this.loading = false;
-        this.componentLoaded = false;
         this.loadError = error.message || this.$t1("页面加载失败");
       }
     },
@@ -198,11 +180,7 @@ export default {
         return;
       }
 
-      let props = this.handleCustomEvent(
-        this.field.options.componentConfig,
-        ["formModel"],
-        [this.formModel]
-      );
+      let props = this.handleCustomEvent(this.field.options.componentConfig);
       this.componentProps = props && typeof props === "object" ? props : {};
     },
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-vue-page/vue-page-editor.vue

@@ -39,7 +39,7 @@ export default {
   },
   data() {
     return {
-      params: ["dataId", "formCode", "formModel"],
+      params: ["dataId", "formCode"],
     };
   },
 };

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -799,6 +799,12 @@ export const defaultWidgetShowRuleConfig = {
   widgetShowRuleConfig: [],
 };
 
+export const defaultLabelIconConfig = {
+  labelIconClass: null,
+  labelIconPosition: "rear",
+  labelTooltip: null,
+};
+
 const vabsearchConfig = {
   name: "",
   keyNameEnabled: !1,
@@ -814,6 +820,7 @@ const vabsearchConfig = {
   required: !1,
   labelWidth: null,
   labelHidden: !1,
+  ...defaultLabelIconConfig,
   readonly: true,
   /*formCode: null,
   formName: null,
@@ -863,6 +870,7 @@ const projectTagConfig = {
   required: !1,
   labelWidth: null,
   labelHidden: !1,
+  ...defaultLabelIconConfig,
   onCreated: "if(dataId)this.loadDataDefaultHandle();",
   onMounted: "",
   onClick: "",
@@ -1016,17 +1024,7 @@ export const basicFields = [
       validation: "",
       validationHint: "",
       customClass: "",
-      /*labelIconClass: null,
-      labelIconPosition: "rear",
-      labelTooltip: null,
-      minLength: null,
-      maxLength: null,
-      showWordLimit: !1,
-      prefixIcon: "",
-      suffixIcon: "",
-      appendButton: !1,
-      appendButtonDisabled: !1,
-      buttonIcon: "el-icon-search",*/
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       onInput: "",
@@ -1939,6 +1937,7 @@ export const basicFields = [
       labelAlign: "",
       labelWidth: null,
       labelHidden: !1,
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       accessType: "1",
@@ -1982,6 +1981,7 @@ export const basicFields = [
       hidden: !1,
 
       customClass: "",
+      ...defaultLabelIconConfig,
 
       prefixIcon: "",
       suffixIcon: "",
@@ -2754,7 +2754,7 @@ export const advancedFields = [
       onMounted: "",
       onAfterConfirmFile: "",
       vabUpload: 1,
-
+      ...defaultLabelIconConfig,
       ...httpConfig,
       formScriptCode: "getList",
 
@@ -3294,6 +3294,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !1,
       optionItemValueType: 0,
+      ...defaultLabelIconConfig,
       statusType: "common",
       statusParam: [],
 
@@ -3558,6 +3559,7 @@ export const businessFields = [
       labelAlign: "",
       labelWidth: null,
       labelHidden: !1,
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       accessType: "1",
@@ -3596,6 +3598,7 @@ export const businessFields = [
       labelAlign: "",
       labelWidth: null,
       labelHidden: !1,
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       accessType: "1",
@@ -3634,6 +3637,7 @@ export const businessFields = [
       labelAlign: "",
       labelWidth: null,
       labelHidden: !1,
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       accessType: "1",
@@ -3672,6 +3676,7 @@ export const businessFields = [
       labelAlign: "",
       labelWidth: null,
       labelHidden: !1,
+      ...defaultLabelIconConfig,
       onCreated: "",
       onMounted: "",
       accessType: "1",
@@ -3890,7 +3895,7 @@ export const businessFields = [
 
       // ...httpConfig,
       // formScriptCode: "getList",
-
+      ...defaultLabelIconConfig,
       ...defaultWfConfig,
 
       showRuleFlag: 1,