cloud-web-corejs 1.0.134 → 1.0.136

package/src/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin.js

@@ -56,7 +56,10 @@ export default {
   },
   watch: {
     fieldModel(val) {
-      this.handleChangeEvent(val);
+      // this.handleChangeEvent(val);
+      let currentData = this.currentData;
+      let fieldKeyName = this.fieldKeyName;
+      currentData[fieldKeyName] = val;
     },
     showValue(val) {
       this.setShowValue(val);

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

@@ -12,8 +12,14 @@
     :sub-form-row-id="subFormRowId"
   >
     <span class="button-sty" v-if="designState">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain >暂存</el-button>
-      <el-button class="btn-connect" icon="iconfont icon-chakanshuju" type="success"></el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" plain
+        >暂存</el-button
+      >
+      <el-button
+        class="btn-connect"
+        icon="iconfont icon-chakanshuju"
+        type="success"
+      ></el-button>
     </span>
     <temp-storage-button
       v-else
@@ -102,7 +108,7 @@ export default {
 
       this.initConfig();
     },
-    initConfig(){
+    initConfig() {
       let formCode = this.getFormRef()?.reportTemplate?.formCode;
       let tempStorageCode = this.field.options.tempStorageCode || formCode;
       let vue = this.getFormRef();
@@ -113,11 +119,25 @@ export default {
           return this.formModel;
         },
         chooseConfirm: (tempStorageData) => {
-          this.getFormRef().setFormData(tempStorageData);
+          vue.showFormContent = false;
+          this.$nextTick(() => {
+            this.getFormRef().setFormData(tempStorageData);
+            this.$nextTick(() => {
+              vue.showFormContent = true;
+              this.$nextTick(() => {
+                this.handleCustomEvent(
+                  this.field.options.tempStorageConfirm,
+                  ["tempStorageData"],
+                  [tempStorageData]
+                );
+              });
+            });
+          });
+          // this.getFormRef().setFormData(tempStorageData);
         },
         saveConfirm: () => {},
-      }
-    }
+      };
+    },
   },
 };
 </script>

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

@@ -54,6 +54,9 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -41,6 +41,9 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item label="隐藏取消按钮" label-width="150px">
+      <el-switch v-model="optionModel.hideCancelButton"></el-switch>
+    </el-form-item>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>

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

@@ -1,23 +1,42 @@
 <template>
-  <el-form-item :label="i18nt('暂存唯一编码')">
-    <el-input type="text" v-model="optionModel.tempStorageCode" placeholder="默认表单模板编码"></el-input>
-  </el-form-item>
+  <div>
+    <el-form-item :label="i18nt('暂存唯一编码')">
+      <el-input
+        type="text"
+        v-model="optionModel.tempStorageCode"
+        placeholder="默认表单模板编码"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="暂存回填完成回调" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('tempStorageConfirm', chooseConfirmParams)"
+      >
+        <span>{{ optionModel.tempStorageConfirm }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n";
-
-  export default {
-    name: "tempStorage-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+export default {
+  name: "tempStorage-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      chooseConfirmParams: ["dataId", "formCode", "tempStorageData"],
+    };
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -300,6 +300,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotShowQueryButton: false,
     },
   },
   /*{
@@ -902,6 +903,7 @@ const projectTagConfig = {
   tagConfirmCallback: null,
   tagDeleteCallback: null,
   tabDeleteEnabled: true,
+  tagWidth: ""
 };
 
 const httpConfig = {
@@ -3060,6 +3062,7 @@ export const advancedFields = [
       enabledImportPreHandle: false,
       tableRef: "",
       onSuccessImport: "",
+      hideCancelButton:false,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3106,6 +3109,7 @@ export const advancedFields = [
       onConfirmImportEnabled: false,
       onConfirmImport: "",
       onSuccessImport: "",
+      hideCancelButton:false,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3686,6 +3690,7 @@ export const businessFields = [
 
       tempStorageFlag:1,
       tempStorageCode:null,
+      tempStorageConfirm:null,
 
       customClass: "",
       onCreated: "",