cloud-web-corejs 1.0.75 → 1.0.77

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

@@ -14,12 +14,21 @@
             <el-switch v-model="formConfig.wfEnabled"
                        @change="changeWfEnabled"></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('流程启动时自动保存表单数据')">
+            <el-switch v-model="formConfig.wfStartBindSave"></el-switch>
+          </el-form-item>
           <el-form-item :label="i18nt('默认流程单据类型名称')">
             <el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
           </el-form-item>
           <el-form-item :label="i18nt('引用流程的表单编码')">
             <el-input type="text" v-model="designer.vueInstance.reportTemplate.fromWfFormCode"></el-input>
           </el-form-item>
+          <el-form-item :label="i18nt('流程自定义配置')">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="editFormEventHandler('wfConfig')">
+              <span>{{ formConfig.wfConfig }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <!--          <el-form-item label="流程单据定义">
                       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
                         <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
@@ -358,7 +367,8 @@ export default {
         onBeforeCreated: 'onBeforeCreated(dataId,formCode,done) {',
         onFormCreated: 'onFormCreated(dataId,formCode) {',
         onFormMounted: 'onFormMounted(dataId,formCode) {',
-        onFormDataChange: 'onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {'
+        onFormDataChange: 'onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {',
+        wfConfig: 'wfConfig(dataId, formCode, formData) {',
         //'onFormValidate':     'onFormValidate() {',
       },
       showVabsearchConfigDialog: false,
@@ -377,7 +387,7 @@ export default {
     //导入表单JSON后需要重新加载自定义CSS样式！！！
     this.designer.handleEvent('form-json-imported', () => {
       this.formCssCode = this.formConfig.cssCode;
-      insertCustomCssToHead(this.formCssCode);
+      insertCustomCssToHead(this.formCssCcssCodeode);
       this.extractCssClass();
       this.designer.emitEvent('form-css-updated', deepClone(this.cssClassList));
     });

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

@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <el-form-item :label="i18nt('启用词汇查询')">
+      <el-switch v-model="optionModel.commonAttributeEnabled" @change="changeCommonAttributeEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('词汇编码')">
+      <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示字段')">
+      <el-input type="text" v-model="optionModel.optionItemLabel"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('关联字段')">
+      <el-input type="text" v-model="optionModel.optionItemValue"></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+
+  export default {
+    name: "commonAttributeEnabled-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+    methods:{
+      changeCommonAttributeEnabled(val){
+        if(val){
+          this.optionModel.formScriptEnabled = false;
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>