cloud-web-corejs 1.0.276 → 1.0.277

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -75,7 +75,6 @@ import VFormRender from "../../../../../components/xform/form-render/index.vue";
 import { traverseAllWidgetsNew } from "../../../../../components/xform/utils/util";
 
 export default {
-  // name: "vabSearchDialog",
   components: { VFormRender },
   props: ["visiable", "multi", "rows", "param", "widget", "option"],
   mixins: [selectDialogMixins],
@@ -210,7 +209,7 @@ export default {
   methods: {
     reload() {
       this.showRender = false;
-      this.getReportTemplate();
+      return this.getReportTemplate();
     },
     async getReportTemplate() {
       let param = {
@@ -224,7 +223,7 @@ export default {
       data = { stringOne: this.formCode };
 
       let that = this;
-      this.$http({
+      return this.$http({
         url: url,
         method: `post`,
         data: data,

package/src/components/xform/form-designer/form-widget/dialog/vabSearchDialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>重置
+                          plain>刷新
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
             </div>

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

@@ -1,35 +1,52 @@
 <template>
-  <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
-                            :display-style="field.options.displayStyle"
-                            :parent-widget="parentWidget" :parent-list="parentList"
-                            :index-of-parent-list="indexOfParentList"
-                            :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
-                            :sub-form-row-id="subFormRowId">
-  <div class="ellipsis">
-    <a class="a-link" :class="widgetClass" @click="handleClick">
-      <template v-if="!!label"></template>
-      <el-tooltip :enterable="false" effect="dark" :content="label" placement="top"
-                  popper-class="tooltip-skin" :disabled="!label || field.options.disabled">
-        <span>
-          <i :class="field.options.prefixIcon" v-if="!!field.options.prefixIcon"></i>
-          <span v-if="!!showLabel">{{ showLabel }}</span>
-          <i :class="field.options.suffixIcon" v-if="!!field.options.suffixIcon"></i>
-        </span>
-      </el-tooltip>
-    </a>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <div class="ellipsis">
+      <a class="a-link" :class="widgetClass" @click="handleClick">
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="label"
+          placement="top"
+          popper-class="tooltip-skin"
+          :disabled="!label || field.options.disabled"
+        >
+          <span>
+            <i
+              :class="field.options.prefixIcon"
+              v-if="!!field.options.prefixIcon"
+            ></i>
+            <span v-if="!!label">{{ label }}</span>
+            <i
+              :class="field.options.suffixIcon"
+              v-if="!!field.options.suffixIcon"
+            ></i>
+          </span>
+        </el-tooltip>
+      </a>
     </div>
-    </static-content-wrapper>
+  </static-content-wrapper>
 </template>
 
 <script>
-import StaticContentWrapper from './static-content-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
 export default {
   name: "a-link-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -40,41 +57,39 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     StaticContentWrapper,
   },
   computed: {
-    showLabel(){
-      return this.field.options.labelHidden? null: this.label;
-    },
     label() {
-      return this.field.options.isFormLabel ? this.getCurrentValue() : this.getI18nLabel(this.field.options.label);
+      return this.field.options.isFormLabel
+        ? this.getCurrentValue()
+        : this.getI18nLabel(this.field.options.label);
     },
     widgetClass() {
       let list = [];
-      let optionModel = this.field.options
+      let optionModel = this.field.options;
       if (optionModel.colorClass) list.push(optionModel.colorClass);
-      if (optionModel.underline) list.push('underLine');
-      if (optionModel.disabled) list.push('is-disabled');
-      return list
-    }
+      if (optionModel.underline) list.push("underLine");
+      if (optionModel.disabled) list.push("is-disabled");
+      return list;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -83,31 +98,30 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
     handleClick(e) {
-      if(this.field.options.disabled)return
+      if (this.field.options.disabled) return;
       this.handleButtonWidgetClick(e);
       if (!this.designState && this.field.options.href) {
         window.open(this.field.options.href);
       }
-    }
-  }
-
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -115,5 +129,4 @@ export default {
 a.is-disabled {
   cursor: not-allowed;
 }
-
 </style>