cloud-web-corejs 1.0.54-dev.260 → 1.0.54-dev.261

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -83,6 +83,7 @@ modules = {
   },
   created() {
     // this.initFieldAttrs();
+    this.initConfig();
     this.initValueWatchEvent();
     if (this.field.options.searchDialogConfig) {
       if (this.field.options.searchDialogConfig.multipleChoices === void 0) {
@@ -101,6 +102,9 @@ modules = {
         }
       }
     }
+    if (this.hasCofig("a")) {
+
+    }
   },
   mounted() {
   },
@@ -182,7 +186,18 @@ modules = {
       this.setReadonly(this.field.options.readonly)
     },
     initConfig() {
+      let options = this.field.options;
       let config = this.designer.getFieldWidgetByType(this.field.type);
+      Object.keys(config).forEach(function (k) {
+        if (!options.hasOwnProperty(k)) {
+          let val = config[k]
+          if (Array.isArray(val)) {
+            options[k] = []
+          } else {
+            options[k] = null
+          }
+        }
+      })
       this.field.options = Object.assign(
         {},
         config.options,
@@ -935,12 +950,20 @@ modules = {
     handleCustomClickEvent: function (flag) {
       let tableParam = this.tableParam;
       let clickBindEvent = !flag ? this.field.options.clickBindEvent : this.field.options.widgetTextLinkConfig?.options?.clickBindEvent;
-      if (clickBindEvent == "1") {
-        //打开选择弹框
-        this.openSearchDialog(tableParam, flag);
-      } else if (clickBindEvent == "2") {
-        //列表插入数据
-        this.handleAddTableDataEvent(flag);
+
+      const done = () => {
+        if (clickBindEvent == "1") {
+          //打开选择弹框
+          this.openSearchDialog(tableParam, flag);
+        } else if (clickBindEvent == "2") {
+          //列表插入数据
+          this.handleAddTableDataEvent(flag);
+        }
+      }
+      if (clickBindEvent && this.field.options.onBeforeClickButton) {
+        if (this.handleCustomEvent(this.field.options.onBeforeClickButton, ["done"], [done]) !== false) {
+          done();
+        }
       }
     },
     handleAddTableDataEvent(flag) {

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

@@ -6,8 +6,17 @@
         <el-option value="2" label="列表添加数据"></el-option>
       </el-select>
     </el-form-item>
-    <searchDialogEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel" v-if="optionModel.clickBindEvent=='1'"></searchDialogEventEditor>
-    <addTableDataEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel" v-if="optionModel.clickBindEvent=='2'"></addTableDataEventEditor>
+    <el-form-item label="点击前置事件" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onBeforeClickButton', evnentParams)">
+        <span>{{ optionModel.onBeforeClickButton }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <searchDialogEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel"
+                             v-if="optionModel.clickBindEvent=='1'"></searchDialogEventEditor>
+    <addTableDataEventEditor :designer="designer" :selectedWidget="selectedWidget" :optionModel.sync="optionModel"
+                             v-if="optionModel.clickBindEvent=='2'"></addTableDataEventEditor>
   </div>
 </template>
 <script>
@@ -15,53 +24,59 @@ import searchDialogEventEditor from "./search-dialog-event-editor.vue";
 import addTableDataEventEditor from "./addTableData-event-editor.vue";
 import {defaultSearchDialogConfig} from "../../../../../../components/xform/form-designer/widget-panel/widgetsConfig";
 
-
 import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 let clickBindEventConfig = {
-  searchDialogConfig:{
+  searchDialogConfig: {
     ...defaultSearchDialogConfig
   },
-  addTableDataConfig:{
-    tableRef:null,
-    tableData:{}
+  addTableDataConfig: {
+    tableRef: null,
+    tableData: {}
   }
 }
 
 export default {
   name: "clickBindEvent-editor",
-  mixins: [i18n],
+  mixins: [i18n, eventMixin],
   props: {
     designer: Object,
     selectedWidget: Object,
     optionModel: Object,
   },
-  components:{
+  components: {
     searchDialogEventEditor,
     addTableDataEventEditor
   },
-  provide(){
+  provide() {
+    return {
+      defaultClickBindEventConfig: clickBindEventConfig
+    }
+  },
+  data() {
     return {
-      defaultClickBindEventConfig:clickBindEventConfig
+      evnentParams: ["dataId", "formCode", "done"]
     }
   },
   created() {
-    if(!this.optionModel.addTableDataConfig){
+    if (!this.optionModel.addTableDataConfig) {
       this.$set(this.optionModel, 'addTableDataConfig', this.$baseLodash.cloneDeep(clickBindEventConfig.addTableDataConfig));
     }
-    if(!this.optionModel.searchDialogConfig){
+    if (!this.optionModel.searchDialogConfig) {
       this.$set(this.optionModel, 'searchDialogConfig', this.$baseLodash.cloneDeep(clickBindEventConfig.searchDialogConfig));
     }
-    if(this.optionModel.searchDialogConfig.multipleChoices === void 0){
-      if(this.selectedWidget.type=='vabsearch'){
-        this.$set(this.optionModel.searchDialogConfig,'multipleChoices',false);
-      }else{
-        this.$set(this.optionModel.searchDialogConfig,'multipleChoices',true);
+    if (this.optionModel.searchDialogConfig.multipleChoices === void 0) {
+      if (this.selectedWidget.type == 'vabsearch') {
+        this.$set(this.optionModel.searchDialogConfig, 'multipleChoices', false);
+      } else {
+        this.$set(this.optionModel.searchDialogConfig, 'multipleChoices', true);
       }
     }
   },
-  methods:{
-    changeEventType(val){
+  methods: {
+    changeEventType(val) {
       // this.optionModel.clickBindEventConfig = clickBindEventConfig;
       // this.$set(this.optionModel, "clickBindEventConfig", clickBindEventConfig);
     }

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

@@ -845,6 +845,7 @@ const vabsearchConfig = {
   onChange: "",
   onAppendButtonClick: "",
   clickBindEvent: '1',
+  onBeforeClickButton:null,
   searchDialogConfig: {
     ...defaultSearchDialogConfig,
     multipleChoices: false
@@ -1810,6 +1811,7 @@ export const basicFields = [
       onClick: "",
       accessType: "1",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2016,6 +2018,7 @@ export const basicFields = [
       onMounted: "",
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2050,6 +2053,7 @@ export const basicFields = [
 
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2759,6 +2763,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       clickBindEvent: '1',
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig,
         tableEnabled: true
@@ -2798,6 +2803,7 @@ export const advancedFields = [
       accessType: "1",
       saveButton: true,
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2837,6 +2843,7 @@ export const advancedFields = [
       onClick: "this.getFormRef().$baseReload()",
       accessType: "1",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2900,6 +2907,7 @@ export const advancedFields = [
       onMounted: "",
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2936,6 +2944,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2982,6 +2991,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -3025,6 +3035,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -3225,6 +3236,7 @@ export const advancedFields = [
 
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },