cloud-web-corejs 1.0.94 → 1.0.96

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

@@ -2,7 +2,7 @@
   <div>
     <el-form-item label="状态配置">
       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-        <span>{{ optionModel.statusParam.length?"已维护":"" }}</span>
+        <span>{{ optionModel.statusParam.length ? "已维护" : "" }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
@@ -21,14 +21,24 @@
       @closed="closeHandle"
     >
       <div class="cont">
-        <el-form-item label="选项值类型">
-<!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
+        <el-form-item label="选项值类型" style="width: 350px;">
+          <!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
           <el-radio-group v-model="optionItemValueType" @change="changeValueType">
             <el-radio :label="0">文本</el-radio>
             <el-radio :label="1">数值</el-radio>
             <el-radio :label="2">布尔值</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="默认值" style="width: 300px;">
+          <el-input v-model="defaultValue" v-if="!optionItemValueType"></el-input>
+          <base-input-number v-model="defaultValue" ref="defaultNumberInput"
+                             v-if="optionItemValueType==1"/>
+          <el-select v-model="defaultValue" v-if="optionItemValueType===2" clearable
+                     @clear="defaultValue=null">
+            <el-option :value="true" label="true"></el-option>
+            <el-option :value="false" label="false"></el-option>
+          </el-select>
+        </el-form-item>
         <el-table
           ref="singleTable"
           width="100%"
@@ -55,8 +65,8 @@
           <el-table-column label="字段值" width="150" prop="value">
             <template slot-scope="scope">
               <el-input v-model="scope.row.value" v-if="optionItemValueType===0"></el-input>
-              <base-input-number v-model="scope.row.value"  v-if="optionItemValueType===1"></base-input-number>
-              <template v-if="optionItemValueType===2">{{scope.row.value}}</template>
+              <base-input-number v-model="scope.row.value" v-if="optionItemValueType===1"></base-input-number>
+              <template v-if="optionItemValueType===2">{{ scope.row.value }}</template>
             </template>
           </el-table-column>
           <el-table-column label="状态颜色" width="100" prop="type">
@@ -128,14 +138,15 @@ export default {
     selectedWidget: Object,
     optionModel: Object,
   },
-  data(){
+  data() {
     return {
-      showDialog:false,
-      tableData:[],
-      optionItemValueType:0
+      showDialog: false,
+      tableData: [],
+      optionItemValueType: 0,
+      defaultValue: null
     }
   },
-  methods:{
+  methods: {
     dragSort: function () {
       var e = this.$refs.singleTable.$el.querySelectorAll('.el-table__body-wrapper > table > tbody')[0],
         t = this.tableData;
@@ -150,51 +161,59 @@ export default {
         }
       });
     },
-    closeHandle(){
+    closeHandle() {
       this.showDialog = false;
     },
-    openDialog(){
+    openDialog() {
       this.optionItemValueType = this.optionModel.optionItemValueType
+      this.defaultValue = this.optionModel.defaultValue == null ? undefined : null
       this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
       this.showDialog = true;
       this.$nextTick(function () {
         this.dragSort();
       });
     },
-    addItem(){
+    addItem() {
       this.tableData.push({
-        value:null,
-        label:null,
-        type:null
+        value: null,
+        label: null,
+        type: null
       })
     },
-    confirmDialog(){
+    confirmDialog() {
       this.optionModel.optionItemValueType = this.optionItemValueType;
+      this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
       this.optionModel.statusParam = this.$baseLodash.cloneDeep(this.tableData);
       this.showDialog = false;
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         let fieldWidget = this.designer.formWidget.getWidgetRef(this.optionModel.name);
         fieldWidget.refreshWidget();
       })
 
     },
-    deleteItem(rowIndex){
-      this.tableData.splice(rowIndex,1);
+    deleteItem(rowIndex) {
+      this.tableData.splice(rowIndex, 1);
     },
-    changeValueType(val){
+    changeValueType(val) {
       this.tableData = [];
-      if(val==2){
+      if (val == 2) {
         this.tableData.push({
-          label:"是",
-          value:true,
-          type:"success"
+          label: "是",
+          value: true,
+          type: "success"
         });
         this.tableData.push({
-          label:"否",
-          value:false,
-          type:"danger"
+          label: "否",
+          value: false,
+          type: "danger"
         });
       }
+      if (val == 1) {
+        this.defaultValue = undefined
+      } else {
+        this.defaultValue = null
+      }
+
     }
   }
 }

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

@@ -1,7 +1,9 @@
 <template>
   <div>
     <el-form-item label="是否多选">
-      <el-switch v-model="optionModel.multipleChoices"></el-switch>
+      <el-switch v-model="optionModel.multipleChoices"
+                 v-if="selectedWidget.type !== 'singerSearch' && selectedWidget.type !== 'multiSearch'"></el-switch>
+      <span v-else>{{ optionModel.multipleChoices ? '是' : '否' }}</span>
     </el-form-item>
     <el-form-item label="关联字段" v-if="optionModel.multipleChoices">
       <el-input type="text" v-model="optionModel.valueField"></el-input>
@@ -9,6 +11,16 @@
     <el-form-item label="展示字段">
       <el-input type="text" v-model="optionModel.vabSearchName"></el-input>
     </el-form-item>
+    <template v-if="!optionModel.multipleChoices">
+      <el-form-item label="默认当前用户">
+        <el-switch v-model="optionModel.userDefaultVabSearch"
+                   @change="optionModel.saleOrgDefaultVabSearch=false"></el-switch>
+      </el-form-item>
+      <el-form-item label="默认当前机构">
+        <el-switch v-model="optionModel.saleOrgDefaultVabSearch"
+                   @change="optionModel.userDefaultVabSearch=false"></el-switch>
+      </el-form-item>
+    </template>
   </div>
 </template>