cnhis-design-vue 0.2.67-beta → 0.2.70-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.67-beta",
+  "version": "0.2.70-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -3,7 +3,8 @@
     class="big-table"
     :class="{
       mt: visibleCheckAllWrap || visibleTreeCheck || hasRefresh,
-      'expand-padding': !isNestTable
+      'expand-padding': !isNestTable,
+      'table-editing': isTableEdit
     }"
     :style="{ height: tableHeight }"
   >
@@ -206,10 +207,10 @@ export default create({
     this.loadColumn(this.columnConfig);
     this.loadData(this.data);
   },
-  activated() {
-    // 行编辑状态下 切换tab 再切回 需要重置页面样式
-    this.removeInsert();
-  },
+  // activated() {
+  //   // 行编辑状态下 切换tab 再切回 需要重置页面样式
+  //   this.removeInsert();
+  // },
   beforeRouteLeave() {},
   destroyed() {
     this.unBindDocumentClick();
@@ -356,7 +357,16 @@ export default create({
     },
     tableNoSetting(){
       let { noSetting } = this.getOtherConfigInit() || {};
-      return noSetting || this.showSettings?.hideSettingBtn == 1;
+      return noSetting || this.showSettings?.hideSettingBtn == 1 || this.isTableEdit;
+    },
+    // 行编辑字段map
+    listFormUnionSettingMap(){
+      let paramsList = this?.listFormUnionSetting?.paramsList || {};
+      let tableFieldMap = {};
+      paramsList.forEach(v=>{
+        tableFieldMap[v.tableField] = v;
+      })
+      return tableFieldMap
     }
   },
   watch: {
@@ -408,54 +418,10 @@ export default create({
         this.handleTableImageSize(val, 'LIST_FIELD_SMALL', v + 'px');
       }
     },
-    // 监听行内编辑表单，是否已校验并组装数据完毕
-    inlineEditFormSubmitDone(val) {
-      if (!val || this.isNestTable) return;
-      if (this.isTree != 0 || !this.isMatchComponent) return false;
-      if (!this.checkOperateCurrentTable()) return false;
-      this.submitInlineForm();
-    },
-    // 监听行内编辑按钮的触发状态
-    isInlineEditing(val) {
-      if (!val || this.isNestTable) return false;
-      if (this.isTree != 0 || !this.isMatchComponent) return false;
-      if (!this.checkOperateCurrentTable()) {
-        this.resetOperationRowStatus();
-        return false;
-      }
-
-      this.hideSelectCloumns();
-      this.handleClickEditBtnByInline();
-    },
-    // 监听行内新增按钮的触发状态
-    isInlineAdding(val) {
-      if (!val || this.isNestTable) return false;
-      if (this.isTree != 0 || !this.isMatchComponent) return false;
-      if (!this.checkOperateCurrentTable()) {
-        this.resetOperationRowStatus();
-        return false;
-      }
-
-      this.hideSelectCloumns();
-      this.handleClickAddBtnByInline();
-    },
-    isInlineSave(val) {
-      if (!val || this.isNestTable) return false;
-      if (this.isTree != 0 || !this.isMatchComponent) return false;
-      if (!this.checkOperateCurrentTable()) return false;
-      this.handleClickSaveBtnByInline();
-    },
-    isInlineCancel(val) {
-      if (!val || this.isNestTable) return false;
-      if (this.isTree != 0 || !this.isMatchComponent) return false;
-      if (!this.checkOperateCurrentTable()) return false;
-
-      this.removeInlineAddRow();
-      this.handleClickCancelBtnByInline();
-    },
-    $route(val) {
-      this.resetTableInlineEditStatus();
-    },
+   
+    // $route(val) {
+    //   this.resetTableInlineEditStatus();
+    // },
     tableRefreshCache: {
       immediate: true,
       deep: true,
@@ -476,7 +442,18 @@ export default create({
           }
         });
       }
-    }
+    },
+    // isEditAllRow:{
+    //   handler(val){
+    //     // 全部行编辑需要隐藏“操作”列
+    //      this.customerInit();
+    //     // 有已选的数据，清空。
+    //     let len = this?.checkedRows?.length || 0;
+    //     if(len > 0){
+    //       this.removeCheckedRows(this.checkedRows)
+    //     }
+    //   }
+    // }
   },
   methods: {
     customerInit(){
@@ -511,6 +488,7 @@ export default create({
     },
     // 加载表格内容
     async loadData(data) {
+      this.isLoadData = false;
       this.isShowEmpty = !data?.length;
 
       const list = JSON.parse(JSON.stringify(data));
@@ -541,6 +519,7 @@ export default create({
 
       this.setGroupTreeExpand();
       this.resetTableInlineEditStatus();
+      this.isLoadData = true;
     },
     setGroupTreeExpand() {
       let isExpand = this.isTree == 1 && this.isExpand == 1 && this.total < 1001;
@@ -572,6 +551,8 @@ export default create({
     },
     resetTableInlineEditStatus() {
       if (!this.checkOperateCurrentTable()) return false;
+      // 编辑中，不重置样式
+      if(this.defaultEditAllRow || this.isEditAllRow || this.isInlineEditing|| this.isBatchEditing) return false;
       this.handleClickCancelBtnByInline();
     },
     setChecklist(list) {
@@ -604,6 +585,7 @@ export default create({
     },
     // 加载表格头部
     loadColumn(config) {
+      this.isLoadColumn = false;
       this.setTableConfig(config);
       // this.hasOnlyIcon = config.hasOnlyIcon;
       let columns = this.formatColumns(config);
@@ -613,6 +595,9 @@ export default create({
 
       this.setGroupTreeExpand();
       this.resetTableInlineEditStatus();
+
+      this.isLoadColumn = true;
+
     },
     setTableConfig(config) {
       this.showButtonTop = config.showButtonTop;
@@ -715,17 +700,27 @@ export default create({
     },
     // 日期显示格式化
     getDate(row, item) {
-      let obj = row[item.columnName] || "";
+      let obj = row[item.columnName];
+      let style = {}
+      // fillColor 有值代表背景色
+      if (obj?.fillColor) {
+        style.background = obj.fillColor
+        style.color = '#fff'
+        style.padding = "0 2px"
+      }
+      if (obj?.background) {
+        style.color = obj.background
+      }
       if (!vexutils.isEmpty(obj)) {
         if (vexutils.isObject(obj) && 'tooltip' in obj) {
           return [
             <a-tooltip title={obj.tooltip}>
-              <span domPropsInnerHTML={obj.value} />
+              <span domPropsInnerHTML={obj.value} style={style} />
             </a-tooltip>
           ];
         }
       }
-      return [<span domPropsInnerHTML={obj}></span>];
+      return [<span domPropsInnerHTML={obj} style={style}></span>];
     },
     // 百分数格式化
     getPercentage(row, item) {
@@ -863,7 +858,14 @@ export default create({
           key = temp.tooltip || temp.value; // temp.tooltip 日期的处理
         }
       }
-      return [<a-switch checked={key == item.btnLinkSwitchDefVal} disabled={disabled} on-change={e => this.switchBtnOnChange(e, row, item, index)} />];
+      let isEdit = (this.isBatchEditing || this.isInlineEditing || this.isInlineAdding);
+
+      let f =  isEdit ? this.listFormUnionSettingMap[item.columnName] ? disabled : true : disabled;
+
+      function switchClick(e){
+          e.stopPropagation();
+      }
+      return [<div onClick={switchClick} style="display: inline-block;"><a-switch checked={key == item.btnLinkSwitchDefVal} disabled={f} on-change={e => this.switchBtnOnChange(e, row, item, index)} /></div>];
     },
     // 字段显示 jsx
     getField(row, item, index, isLink) {
@@ -928,6 +930,7 @@ export default create({
     },
     // 按钮 jsx
     getTileBtnList(row, index) {
+      if (this.isRowEditing) return;
       return [
         (row.tileBtnList?.length &&
           row.tileBtnList.map((btn, j) => {
@@ -961,6 +964,7 @@ export default create({
     },
     // 按钮 jsx
     getFoldBtnList(row, index) {
+      if (this.isRowEditing) return
       return [
         (row.foldBtnList?.length && (
           <a-dropdown style={{ display: !row.__isInlineEditing ? 'inline-block' : 'none' }} disabled={this.isInlineOperating}>
@@ -1001,11 +1005,7 @@ export default create({
         <span>
           <a-button
             style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }}
-            on-click={e => {
-              e.stopPropagation();
-              this.$emit('SET_SAVE_ROW_STATUS', true);
-              // this.SET_SAVE_ROW_STATUS(true);
-            }}
+            on-click={this.setBatchSaveRowStatus}
             title="保存"
             class="btn-custom-class row-btn"
             type="link"
@@ -1015,11 +1015,7 @@ export default create({
           </a-button>
           <a-button
             style={{ display: row.__isInlineEditing ? 'inline-block' : 'none' }}
-            on-click={e => {
-              e.stopPropagation();
-              this.$emit('SET_CANCEL_ROW_STATUS', true);
-              // this.SET_CANCEL_ROW_STATUS(true);
-            }}
+            on-click={this.setBatchCancelRowStatus}
             title="取消"
             class="btn-custom-class row-btn"
             type="link"
@@ -1030,8 +1026,33 @@ export default create({
         </span>
       ];
     },
+    setBatchSaveRowStatus(e){
+      e.stopPropagation();
+      let { btnName, tipsMsg, isTips } = this.curBatchBtnData || {};
+      let _this = this;
+      // 保存是否需要提示
+      if (isTips != 1) {
+        this.$emit('setBatchSaveRowStatus', true);
+        return;
+      }
+      this.$confirm({
+        title: tipsMsg || `是否确认${btnName}`,
+        okText: '确定',
+        cancelText: '取消',
+        onOk: () => {
+          _this.$emit('setBatchSaveRowStatus', true);
+        },
+        onCancel() {
+        }
+      });
+    },
+    setBatchCancelRowStatus(e) {
+      e.stopPropagation();
+      this.$emit('setBatchCancelRowStatus', true);
+    },
     checkOperateCurrentTable() {
       if (this.isNestTable) return false;
+      if(this.defaultEditAllRow) return true;
       let id = this.inlineEditCurrentOperateBtnId;
       let find = this.btnList?.find(item => {
         return item?.settingObj?.[0]?.obj_id === id;
@@ -1083,80 +1104,6 @@ export default create({
         rowIndex: i
       };
     },
-    async handleClickAddBtnByInline() {
-      if (!this.checkListFormUnionSettingParamsList()) {
-        this.handleClickCancelBtnByInline();
-        return false;
-      }
-      // 去掉更新后台时间
-      // let userInfo = await this.GetRealtimeSysParams();
-      // userInfo &&
-      //   Object.assign(this.configuration, {
-      //     userInfo
-      //   });
-
-      await this.resetInlineEdit();
-      this.$emit('handleClickBtnByInline', {
-        type: 'ADD',
-        listFormUnionSetting: this.listFormUnionSetting,
-        inlineEditFormConfig: this.inlineEditFormConfig
-      });
-
-      addInlineEditPrimaryKey = Date.now();
-      let formData = {
-        [this.handleRowId]: addInlineEditPrimaryKey,
-        __isInsertRow: true
-      };
-      let { paramsList } = this.listFormUnionSetting;
-      paramsList.forEach(item => {
-        formData[item.tableField] = undefined;
-      });
-
-      let vxeTable = this.$refs.xGrid;
-      await vxeTable.insert(formData);
-      await vxeTable.loadData([formData]);
-      this.setAllRowInlineStatus(true);
-      this.setRowStatus(vxeTable.$el, 0, '66');
-    },
-    async handleClickEditBtnByInline() {
-      if (!this.checkListFormUnionSettingParamsList()) {
-        this.handleClickCancelBtnByInline();
-        return false;
-      }
-      // 去掉更新后台时间
-      // let userInfo = await this.GetRealtimeSysParams();
-      // userInfo &&
-      //   Object.assign(this.configuration, {
-      //     userInfo
-      //   });
-
-      let vxeTable = this.$refs.xGrid;
-
-      let { row, rowIndex } = this.getInlineOpreateRow();
-      this.recordClickBtnInfo(row, rowIndex);
-
-      // HACK: 重置非当前表单的行内编辑状态（多列表场景）
-
-      await this.resetInlineEdit();
-      await vxeTable.loadData([row]);
-      this.$emit('handleClickBtnByInline', {
-        type: 'EDIT',
-        listFormUnionSetting: this.listFormUnionSetting,
-        inlineEditFormConfig: this.inlineEditFormConfig,
-        inlineEditOriginalTableRow: this.oldtableData[rowIndex]
-      });
-
-      // this.SET_LIST_FORM_UNION_SETTING(this.listFormUnionSetting);
-      // this.SET_FORM_CONFIG(this.inlineEditFormConfig);
-      // this.SET_ORIGINAL_TABLE_ROW(this.oldtableData[rowIndex]);
-
-      // vxeTable.setActiveRow(row);
-
-      this.setAllRowInlineStatus(true);
-      this.$set(row, '__isInlineEditing', true);
-
-      this.setRowStatus(vxeTable.$el, 0, '66');
-    },
     setAllRowInlineStatus(disabled = false) {
       let vxeTable = this.$refs.xGrid;
       let { tableData } = vxeTable.getTableData();
@@ -1165,18 +1112,6 @@ export default create({
         this.$set(row, '__isDisableInlineEdit', disabled);
       });
     },
-    handleClickSaveBtnByInline() {
-      if (this.spinning) return false;
-      this.$emit('handleClickBtnByInline', { type: 'SAVE' });
-
-      let formDom = document.querySelectorAll('.js-inlineEditForm');
-      let sliceLen = this.handleEditFormLength();
-      // HACK: vxeTable行内编辑时复制的DOM节点，无需触发提交
-      formDom = [...formDom].slice(0, sliceLen);
-      formDom.forEach(item => {
-        item.__vue__.handleSubmitForm();
-      });
-    },
     async handleClickCancelBtnByInline() {
       let vxeTable = this.$refs.xGrid;
       this.setRowStatus(vxeTable.$el, 0, null);
@@ -1196,7 +1131,7 @@ export default create({
       if (row?.__isInsertRow) {
         vxeTable.remove(row);
       }
-      vxeTable.clearActived().then(() => {
+      vxeTable?.clearActived()?.then(() => {
         row && vxeTable.revertData(row);
         this.setRowStatus(vxeTable.$el, rowIndex, null);
         vxeTable.resetColumn();
@@ -1225,9 +1160,6 @@ export default create({
     resetStoreInlineOperationStatus() {
       if (this.isTree != 0) return false;
       this.isSaveForm = false;
-
-      // this.SET_ADD_ROW_STATUS(false);
-      // this.SET_EDIT_ROW_STATUS(false);
     },
     removeInlineAddRow() {
       if (!this.isInlineAdding) return false;
@@ -1236,57 +1168,6 @@ export default create({
       let { tableData } = vxeTable.getTableData();
       vxeTable.remove(tableData[0]);
     },
-    submitInlineForm() {
-      let error = this.inlineError;
-      if (error) {
-        this.resetEditRowStatus();
-        this.$emit('triggerSpinning', false);
-        return false;
-      }
-
-      let { inlineFormData, listFormUnionSetting, inlineOriginalTableRow } = this;
-      let { formId } = listFormUnionSetting;
-      let { id } = inlineOriginalTableRow;
-      if (!formId) {
-        console.log('缺少formId');
-        this.$emit('triggerSpinning', false);
-        return;
-      }
-      if (this.isSaveForm) return false;
-      this.isSaveForm = true;
-
-      let params = Object.assign({}, inlineFormData, {
-        formId,
-        id,
-        editMode: 'row'
-      });
-      params = JSON.parse(JSON.stringify(params));
-
-      let noChangePrimaryKey = params[this.handleRowId] === addInlineEditPrimaryKey;
-      if (this.isInlineAdding && noChangePrimaryKey) {
-        delete params[this.handleRowId];
-      }
-
-      this.submitForm(params)
-        .then(async ({ data }) => {
-          this.$emit('triggerSpinning', false);
-          if (data.result !== 'SUCCESS') {
-            this.isSaveForm = false;
-            this.$message.error(data.resultMsg);
-            this.resetEditRowStatus();
-            return false;
-          }
-
-          await this.resetInlineEdit();
-          this.resetOperationRowStatus();
-          this.$emit('pubTableReload');
-        })
-        .finally(() => {
-          this.isSaveForm = false;
-          this.$emit('triggerSpinning', false);
-          this.resetEditRowStatus();
-        });
-    },
     // 列数据解析逻辑
     formatColumns(map) {
       /**
@@ -1331,7 +1212,7 @@ export default create({
           );
         }
       };
-      let checkVisible = isBatchSelect == 1 && !this.isNestTable && !isScanMultiTable || false;
+      let checkVisible = isBatchSelect == 1 && !this.isNestTable && !isScanMultiTable && !this.isInlineOperating || false;
       let columns = [
         {
           fixed: 'left',
@@ -1387,7 +1268,7 @@ export default create({
         let notParticipatingSort = item?.fieldSetting?.notParticipatingSort || '';
         // 有子列表fixed会遮盖 所以主表不设置fixed
         let fixed = this.isAboutNestTable ? '' : item.isFixed ? (item.isFixed == 1 ? 'left' : 'right') : '';
-        let sortable = this.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
+        let sortable = this.isTableEdit ? false : this.isNestTable ? false : !filterField && item.isSort == 1 && notParticipatingSort != 1 && item.isMerge != 1;
         let treeNode = this.isNestTable ? false : this.isTree != 0 ? index === 0 : false;
         let type = index === 0 && this.showNestTable ? 'expand' : '';
 
@@ -1398,9 +1279,14 @@ export default create({
           treeNode = false;
           type = "";
         }
+        // 行编辑不展示排序
+        if(this.isInlineOperating){
+          sortable = false;
+        }
 
         const col = Object.assign(item, {
-          visible: item.columnName == 'operatorColumn' ? showButtonTop == 0 : item.isShow == 1,
+          // 全部行编辑 隐藏“操作”
+          visible: item.columnName == 'operatorColumn' ? this.isEditAllRow ?  false : showButtonTop == 0 : item.isShow == 1,
           field: item.columnName,
           title: this.handleName(item, 'title'),
           minWidth: item.colWidth,
@@ -1423,7 +1309,7 @@ export default create({
           editRender: this.generateEditRender(item)
         });
 
-        if (filterField && !this.isNestTable && !isScanMultiTable) {
+        if (filterField && !this.isNestTable && !isScanMultiTable && !this.isTableEdit) {
           this.$set(
             this.filterFields,
             item.columnName,
@@ -2040,9 +1926,6 @@ export default create({
       if (formUnionItem) {
         let dynamicProps = this.initBatchDynamicProps(formUnionItem, row, column, $rowIndex);
         if (dynamicProps) {
-          // console.log(dynamicProps);
-          // loading 使用
-          this.$emit('setWaitEditKeys', column.property);
           return [
             <EditForm class={`js-inlineEditForm`} key={row[this.primaryKey] + $rowIndex + column.property} data-key={row[this.primaryKey] + $rowIndex + column.property} {...dynamicProps}></EditForm>
           ];
@@ -2110,7 +1993,7 @@ export default create({
       }
 
       if (column.property === 'operatorColumn') {
-        if (this.showButtonTop != 0 || this.isBatchEditing) return;
+        if (this.showButtonTop != 0 || (this.isBatchEditing && !this.isRowEditing)) return;
         const inlineBtnList = this.generateInlineBtnList(row, $rowIndex);
         const tileBtnList = this.getTileBtnList(row, $rowIndex);
         const foldBtnList = this.getFoldBtnList(row, $rowIndex);
@@ -2132,7 +2015,7 @@ export default create({
               disabled = true;
             }
           }
-          return this.getBtnLinkSwitch(row, own, disabled, $rowIndex);
+          return this.getBtnLinkSwitch(row, own, disabled || this.isTableEdit, $rowIndex);
         } else {
           return this.getField(row, own, $rowIndex, true);
         }
@@ -2706,7 +2589,10 @@ export default create({
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
       this.$emit('clickBtn', row, btn, row[this.handlePrimaryKey], index);
-      // this.handleTopBtnTracher(btn, j);
+      let trigger_type = btn.settingObj?.[0]?.trigger_type
+      if(trigger_type === "EDIT_ROW") {
+        this.checkedRows = [row]
+      }
     },
     recordClickBtnInfo(row, index) {
       this.currentClickBtnInfo = {
@@ -2975,7 +2861,7 @@ export default create({
       rowWrap = rowWrap.filter(item => item);
 
       let height = value ? `${value}px` : value;
-      let lineHeight = value ? `${value - 10}px` : value;
+      let lineHeight = value ? `${value - 14}px` : value;
 
       rowWrap.forEach(wrap => {
         let rowItemWrap = [...wrap.querySelectorAll('.vxe-cell')];

package/packages/big-table/src/assets/style/table-base.less

@@ -148,6 +148,22 @@ body {
     }
   }
 
+  &.table-editing {
+    /deep/ .vxe-table {
+      .vxe-cell--title {
+        .setting {
+          display: none;
+        }
+        .vxe-filter--icon {
+          display: none;
+        }
+      }
+      .vxe-cell--sort {
+        display: none;
+      }
+    }
+  }
+
   th.vxe-header--column {
     cursor: pointer;
   }

package/packages/big-table/src/components/edit-form/EditForm.vue

@@ -10,16 +10,17 @@
         :class="'editeForm-item-' + item.html_type"
       >
         <component
-          v-if="item.isShowComponent"
           :key="item.RandomId"
+          v-if="item.isShowComponent"
+          v-on="$listeners"
           v-bind:is="item.com_name"
           :class="item.html_type"
           :ref="item.html_type + item.val_key"
           :item="item"
           :mainForm="this"
           :defaultValue="defaultValue"
-          v-on="$listeners"
           :form="curForm"
+          :editFormApiConfig="editFormApiConfig"
           @valueOnChange="getValueChange"
         />
       </a-form-model-item>
@@ -31,9 +32,15 @@ const NOCHECKLIST = ['LINE_BREAKS', 'LINEBAR', 'BUTTON', 'PLUGIN', 'TEXT', 'PAGE
 import registerCom from './edit-component/register-com.js';
 import { formCommom } from './edit-mixins/index';
 import validateRules from './edit-item/validate-rules';
+import vexutils from '@/utils/vexutils';
+import { FormModel } from "ant-design-vue";
+
 export default {
   name: 'EditForm',
-  components: {},
+  components: {
+    [FormModel.name]: FormModel,
+    [FormModel.Item.name]: FormModel.Item,
+  },
   mixins: [formCommom, registerCom, validateRules],
   props: {
     defaultForm: {
@@ -76,7 +83,9 @@ export default {
       type: Boolean,
       default: true
     },
-    formPrimaryKey: [Number, String]
+    formPrimaryKey: [Number, String],
+    editFormApiConfig: Object, // 编辑表格api
+    btnList: { type: Array, default: () => [] },
   },
   provide() {
     return {
@@ -278,7 +287,7 @@ export default {
           } else {
             transmitParams[v] = target[v];
           }
-          if (this.$utils.isString(target[v])) {
+          if (vexutils.isString(target[v])) {
             if (target[v] && target[v].includes('###{')) {
               let temp = JSON.parse(target[v].replace('###', ''));
               transmitParams[v] = temp.value;
@@ -304,7 +313,7 @@ export default {
             rowKey: this.formPrimaryKey,
             formData: submData
           };
-          // console.log(this.formPrimaryKey, "--", submData);
+          console.log(this.formPrimaryKey, "--", submData);
           this.$emit('handleSubmit', formObj);
         } else {
           // console.log(this.formPrimaryKey, "--", "banSubmit");
@@ -323,7 +332,8 @@ export default {
     handleFormatSubmit(copy) {
       // Moment 对象不能用 JSON 方式复制
       // let formdata = JSON.parse(JSON.stringify(copy));
-      let formdata = this.$utils.clone(copy, true);
+      let formdata = vexutils.clone(copy, true);
+      console.log(formdata, '--formdata');
 
       // 表格数据格式化符合接口
       Object.keys(formdata).forEach(item => {
@@ -331,7 +341,7 @@ export default {
           case 'INPUT':
           case 'TEXTAREA':
             if (this.formType[item] && this.formType[item].delete_before_after_spaces == 1) {
-              formdata[item] = this.$utils.handleClearStrBlank(formdata[item]);
+              formdata[item] = vexutils.handleClearStrBlank(formdata[item]);
             }
             break;
           case 'DIGITAL':
@@ -359,6 +369,9 @@ export default {
               formdata[item] = formdata[item] ? formdata[item].format(this.handlerGetDateType(this.formType[item])) : null;
             }
             break;
+          case 'SWITCH_COMPONENT':
+            formdata[item] = this.handleSwitchCom(item, formdata[item])
+            break;
           default:
             break;
         }
@@ -416,12 +429,17 @@ export default {
         objStr: showList.join(',')
       });
     },
+    handleSwitchCom(key, value){
+      let item = this.formType[key] || {}
+      let {close = {}, open = {}} = item;
+      return value ? open.value : close.value;
+    },
     getObjs(str) {
       /**
        * 处理：{type: "jsonb", value: ""}
        *  */
       let resObj = null;
-      if (this.$utils.isJSON(str)) {
+      if (vexutils.isJSON(str)) {
         resObj = JSON.parse(str);
         if (resObj.type === 'jsonb') {
           resObj = resObj.value;