cnhis-design-vue 0.2.66-beta → 0.2.69-beta

package/packages/big-table/src/components/edit-form/edit-mixins/form-commom.js

@@ -1,16 +1,17 @@
+import vexutils from '@/utils/vexutils';
 export const formCommom = {
   /** 这里的方法 basefrom formitem 都引用， 注意使用 this.xxx 的值 */
-  props: { styleSetting: { type: Object, default: () => {} } },
+  props: { styleSetting: { type: Object, default: () => { } } },
   computed: {
     isFormBoldOpen() {
-      return function(item) {
+      return function (item) {
         let res = item.is_null == '0' && this.styleSetting.formBoldOpen;
         return res;
       };
     },
     // 组合组件 是否显示拖拽icon
     showDragIcon() {
-      return function(item) {
+      return function (item) {
         let { combinationList = [] } = item || {};
         if (!combinationList.length) return false;
         // delete 之后是软删除 过滤 isCombinationHide=true
@@ -19,8 +20,8 @@ export const formCommom = {
       };
     }
   },
-  beforeCreate() {},
-  created() {},
+  beforeCreate() { },
+  created() { },
   methods: {
     // 获取表单默认值
     handleGetdef(item) {
@@ -93,13 +94,15 @@ export const formCommom = {
           defVal = this.getInitializeDef(item);
           defVal = this.transformNumber(defVal);
           break;
-        case 'EVALUATE':
         case 'SWITCH_COMPONENT':
+          defVal = this.getSwitchDef(item);
+          break;
+        case 'EVALUATE':
           defVal = this.getInitializeDef(item);
           break;
         case 'AGE_JSON':
           var d = this.getInitializeDef(item) || {};
-          if (this.$utils.isJSON(d)) {
+          if (vexutils.isJSON(d)) {
             d = JSON.parse(d);
           }
           if (typeof d == 'object') {
@@ -122,6 +125,11 @@ export const formCommom = {
       }
       return defVal;
     },
+    getSwitchDef(item) {
+      let tempDef = this.getInitializeDef(item)
+      return tempDef === item?.open?.value
+
+    },
     getInitializeDef(item) {
       return this.handleSysParams(this.defaultValue[item.name] || item.default_val || '');
     },
@@ -142,7 +150,7 @@ export const formCommom = {
       var checkboxList = [];
       checkboxVal = this.handleSysParams(checkboxVal);
       if (typeof checkboxVal === 'string') {
-        if (this.$utils.isJSON(checkboxVal)) {
+        if (vexutils.isJSON(checkboxVal)) {
           checkboxList = JSON.parse(checkboxVal);
         } else {
           checkboxList = checkboxVal ? checkboxVal.split(',') : [];
@@ -193,9 +201,6 @@ export const formCommom = {
         propsDate = this.handleSysParams(propsDate);
       }
       let dateType = this.handlerGetDateType(item);
-      // if (!this.$utils.isDate(propsDate)) {
-      //   return null;
-      // }
       if (dateType == 'HH:mm:ss' || dateType == 'HH:mm') {
         return propsDate && this.$moment(propsDate, dateType).isValid() ? this.$moment(propsDate, dateType) : null;
       } else {
@@ -235,7 +240,7 @@ export const formCommom = {
     handlerDefaultUpload(data, type = 'default') {
       let currentData;
       let fileList;
-      if (this.$utils.isJSON(data)) {
+      if (vexutils.isJSON(data)) {
         currentData = JSON.parse(data);
       } else {
         currentData = data;
@@ -278,7 +283,7 @@ export const formCommom = {
         let defaultValue = this.defaultValue[v.name] || v.default_val;
         if (typeof defaultValue === 'string') {
           defaultValue = this.handleSysParams(defaultValue);
-          if (!this.$utils.isJSON(defaultValue)) {
+          if (!vexutils.isJSON(defaultValue)) {
             return [];
           }
         }
@@ -353,13 +358,13 @@ export const formCommom = {
     handleGetJsonStr(str) {
       // {objs:[],objstr:''}, {type: 'jsonb', value: "{objs:[],objstr:''}"}
       let resObj = {};
-      if (this.$utils.isJSON(str)) {
+      if (vexutils.isJSON(str)) {
         resObj = JSON.parse(str);
       } else {
         resObj = typeof str === 'string' ? {} : str;
       }
       if (resObj && !resObj.objs && resObj.value) {
-        if (this.$utils.isJSON(resObj.value)) {
+        if (vexutils.isJSON(resObj.value)) {
           resObj = JSON.parse(resObj.value);
           // loop
           if (resObj.type === 'jsonb') {
@@ -387,7 +392,7 @@ export const formCommom = {
       // let isEmpty = v => Object.keys(v || {}).length;
       const that = this;
       const getVal = (t, r, k) => {
-        return t.replace(r, function() {
+        return t.replace(r, function () {
           var pKey = arguments[1];
           var pls = pKey.split('!');
           var plsList = pls.slice(1);
@@ -512,14 +517,14 @@ export const formCommom = {
       }
       if (!v || v.type === 'blur') return;
       const curDateStr = v.format('YYYY-MM-DD');
-      const nowDateStr = this.$utils.toDateString(new Date(), 'yyyy-MM-dd');
+      const nowDateStr = vexutils.toDateString(new Date(), 'yyyy-MM-dd');
       let timeDiff;
       if (CompareDate(curDateStr, nowDateStr)) {
-        timeDiff = this.$utils.getDateDiff(curDateStr, nowDateStr);
+        timeDiff = vexutils.getDateDiff(curDateStr, nowDateStr);
       } else if (curDateStr == nowDateStr) {
         timeDiff = { time: 0 };
       } else if (CompareDate(nowDateStr, curDateStr)) {
-        timeDiff = this.$utils.getDateDiff(nowDateStr, curDateStr);
+        timeDiff = vexutils.getDateDiff(nowDateStr, curDateStr);
         timeDiff.time = -timeDiff.time;
       }
       if (!timeDiff) return;
@@ -538,7 +543,7 @@ export const formCommom = {
       let dueDateM = parseInt(month) + 9 > 12 ? parseInt(month) - 3 : parseInt(month) + 9;
       dueDateM = dueDateM >= 10 ? dueDateM : '0' + dueDateM;
       const dueDateY = parseInt(month) + 9 > 12 ? parseInt(year) + 1 : year;
-      dueDate = this.$utils.toDateString(this.$utils.getWhatDay(`${dueDateY}-${dueDateM}-${day}`, 7), 'yyyy-MM-dd');
+      dueDate = vexutils.toDateString(vexutils.getWhatDay(`${dueDateY}-${dueDateM}-${day}`, 7), 'yyyy-MM-dd');
       // function CompareDate(param) {  }
       mapList.forEach(item => {
         const { validate } = item;

package/packages/big-table/src/components/player-vod/video-list.vue

@@ -23,6 +23,7 @@
 <script>
 import videoModal from './video-modal';
 import { Icon } from 'ant-design-vue';
+import vexutils from '@/utils/vexutils';
 export default {
   name: 'videoList',
   data() {
@@ -114,13 +115,13 @@ export default {
     handleGetJsonStr(str) {
       // [], {type: 'jsonb', value: "[]"}
       let resList = [];
-      if (this.$utils.isJSON(str)) {
+      if (vexutils.isJSON(str)) {
         resList = JSON.parse(str);
       } else {
         resList = typeof str === 'string' ? [] : str;
       }
       if (resList && resList.type === 'jsonb') {
-        if (this.$utils.isJSON(resList.value)) {
+        if (vexutils.isJSON(resList.value)) {
           resList = JSON.parse(resList.value);
           // loop
           if (resList.type === 'jsonb') {

package/packages/big-table/src/utils/batchEditing.js

@@ -1,4 +1,5 @@
 // import { mapMutations, mapActions } from "vuex";
+import utils from "@/utils/utils-map";
 export default {
   props: {
     // 曾经的getters
@@ -23,7 +24,10 @@ export default {
       editColumnMap: {},
       fieldLength: 0,
       originFormatList: [],
-      isSaveForm: false
+      isSaveForm: false,
+      isLoadData: false,
+      isLoadColumn: false,
+      addInlineEditPrimaryKey: ''
     };
   },
   computed: {
@@ -34,19 +38,39 @@ export default {
         switchConfig: this.switchConfig || {},
         hospitalConfigData: this.iconObj || {}
       };
+    },
+    tableLoad() {
+      return {
+        isLoadData: this.isLoadData,
+        isLoadColumn: this.isLoadColumn
+      }
+    },
+    isTableEdit() {
+      return this.isInlineOperating || this.isInlineAdding
     }
   },
   watch: {
+    tableLoad(obj) {
+      if (!obj) return;
+      let { isLoadData, isLoadColumn } = obj;
+      if (!(isLoadData && isLoadColumn)) return;
+      if (this.isBatchEditing) return;
+      this.$emit('tableLoad', true)
+    },
     /**
      * 编辑
      */
-    isBatchEditing(val) {
+    async isBatchEditing(val) {
       if (!val || this.isNestTable) return false;
       if (this.isTree != 0 || !this.isMatchComponent) return false;
       if (!this.checkOperateCurrentTable()) {
         this.resetBatchOperationRowStatus();
         return false;
       }
+      // 非行内按钮触发
+      if (!this.isRowEditing) {
+        await this.toggleColumn()
+      }
       this.hideSelectCloumns();
       this.handleClickBatchEditBtnByInline();
     },
@@ -62,10 +86,11 @@ export default {
     /**
      * 取消
      */
-    isBatchCancel(val) {
+    async isBatchCancel(val) {
       if (!val || this.isNestTable) return false;
       if (this.isTree != 0 || !this.isMatchComponent) return false;
       if (!this.checkOperateCurrentTable()) return false;
+      await this.toggleColumn('showColumn')
       this.handleClickBatchCancelBtnByInline();
     },
     /**
@@ -76,20 +101,58 @@ export default {
       if (this.isTree != 0 || !this.isMatchComponent) return false;
       if (!this.checkOperateCurrentTable()) return false;
       this.submitBatchInlineForm(obj);
+    },
+    async isInlineAdding(val) {
+      if (!val || this.isNestTable) return false;
+      if (this.isTree != 0 || !this.isMatchComponent) return false;
+      if (!this.checkOperateCurrentTable()) {
+        this.resetBatchOperationRowStatus();
+        return false;
+      }
+      await this.toggleColumn()
+      this.hideSelectCloumns();
+      this.handleClickAddRow()
     }
   },
   methods: {
+    toggleColumn(key) {
+      let method = key || 'hideColumn'
+      const xGrid = this.$refs.xGrid;
+      if (!xGrid) return Promise.resolve();
+      let operate = xGrid.getColumnByField("operatorColumn")
+      if (method === 'showColumn' && operate.visible) {
+        return Promise.resolve();
+      }
+      return xGrid[method](operate);
+    },
+    /**
+     * 获取配置的 api 方法
+     * @param {*} params  调用参数
+     * @param {String} key 方法名
+     * @param {Object} config 其他配置
+     */
+    async handleGetConfigApi(params, key, config = {}) {
+      try {
+        // TODO: 判断 fn 是异步函数还是同步
+        const editFormApiConfig = this?.editFormApiConfig || {};
+        const fn = editFormApiConfig[key] || null;
+        if (typeof fn === 'function') {
+          let res = await fn(params, config);
+          return Promise.resolve(res);
+        } else {
+          return Promise.reject(new Error(`${key} Is not a function`));
+        }
+      } catch (error) {
+        return Promise.reject(error);
+      }
+    },
     /**
      * 设置row 为编辑样式
      */
-    getBatchOpreateRows() {
+    getBatchOpreateRows(arr) {
       let vxeTable = this.$refs.xGrid;
-      let arr = this.checkedRows;
       let { tableData } = vxeTable.getTableData();
-      // 全部行编辑
-      if (this.isEditAllRow) {
-        arr = tableData;
-      }
+      if (!arr.length) return;
       // 重置状态时使用
 
       arr.forEach((item, i) => {
@@ -100,7 +163,7 @@ export default {
             rowIndex = matchIndex;
           }
         }
-        this.setRowStatus(vxeTable.$el, rowIndex, '66');
+        this.setRowStatus(vxeTable.$el, rowIndex, 66);
         this.$set(item, '__isInlineEditing', true);
       });
     },
@@ -117,11 +180,29 @@ export default {
       vxeTable.clearActived();
       vxeTable.resetColumn();
       tableData.forEach((row, index) => {
-        // row && vxeTable.revertData(row);
         this.setRowStatus(vxeTable.$el, index, null);
         this.$set(row, '__isInlineEditing', false);
         this.$set(row, '__isDisableInlineEdit', false);
       });
+      this.checkedRows = [];
+    },
+    async handleClickAddRow() {
+      if (!this.checkListFormUnionSettingParamsList()) {
+        this.handleClickCancelBtnByInline();
+        return false;
+      }
+      this.addInlineEditPrimaryKey = Date.now();
+      let formData = {
+        [this.handleRowId]: this.addInlineEditPrimaryKey,
+        __isInsertRow: true
+      };
+      let vxeTable = this.$refs.xGrid;
+      await vxeTable.insert(formData);
+      await vxeTable.loadData([formData]);
+      await this.resetInlineBatchEdit();
+
+      this.setAllRowInlineStatus(true);
+      this.setRowStatus(vxeTable.$el, 0, 66);
     },
     /**
      * 批量编辑
@@ -131,7 +212,6 @@ export default {
         this.handleClickCancelBtnByInline();
         return false;
       }
-
       let vxeTable = this.$refs.xGrid;
       let arr = this.checkedRows;
       let { tableData } = vxeTable.getTableData();
@@ -140,19 +220,10 @@ export default {
         arr = tableData;
       }
       await vxeTable.loadData(arr);
-
-      // 去掉更新后台时间
-      // let userInfo = await this.GetRealtimeSysParams();
-      // userInfo &&
-      //   Object.assign(this.configuration, {
-      //     userInfo
-      //   });
-
       await this.resetInlineBatchEdit();
 
       this.setAllRowInlineStatus(true);
-
-      this.getBatchOpreateRows();
+      this.getBatchOpreateRows(arr);
     },
     /**
      * 批量保存
@@ -202,7 +273,6 @@ export default {
      */
     // 避免每次点击都查询
     async handleFormTheUniqueKey() {
-      this.$emit('initInlineEditFormConfig', { listFormUnionSetting: this.listFormUnionSetting, inlineEditFormConfig: this.inlineEditFormConfig });
       let hasEditRow = this.btnList?.find(item => {
         let trigger_type = item.settingObj && item.settingObj[0]?.trigger_type;
         if (item.isShow == 1 && trigger_type == 'EDIT_ROW') return true;
@@ -217,7 +287,7 @@ export default {
     handleFieldTheUniqueKey() {
       return new Promise((resolve, reject) => {
         let { paramsList = [] } = this.listFormUnionSetting || {};
-        let { fieldList = [] } = this.inlineEditFormConfig;
+        let { fieldList = [] } = this.inlineEditFormConfig || {};
         fieldList = JSON.parse(JSON.stringify(fieldList));
         this.batchFieldList = [];
         let batchFieldList = [];
@@ -269,25 +339,34 @@ export default {
       });
       return editColumnMap;
     },
-    handleRequestedUniqueKey(id) {
-      return this.axios
-        .get('tableList/getPrimaryKey', { params: { tableId: id } })
-        .then(({ data }) => {
-          let result;
-          if (data.result == 'SUCCESS') {
-            const { map = {} } = data;
-            result = map.primaryKey || undefined;
-          } else {
-            result = undefined;
-          }
-          this.cacheUniqueKey[id] = { value: result, status: true };
-          return result;
-        })
-        .catch(err => {
-          console.log(err);
-          this.cacheUniqueKey[id] = { value: undefined, status: true };
-          return undefined;
-        });
+    async handleRequestedUniqueKey(id) {
+      let handleEditFormRequestedUniqueKey = this.editFormApiConfig?.handleEditFormRequestedUniqueKey
+      if (!handleEditFormRequestedUniqueKey || typeof handleEditFormRequestedUniqueKey !== 'function') {
+        handleEditFormRequestedUniqueKey = this.getPrimaryKeyRequest;
+      }
+      return handleEditFormRequestedUniqueKey({ tableId: id }).then((val) => {
+        val && (this.cacheUniqueKey[id] = { value: val, status: true })
+      })
+
+    },
+    getPrimaryKeyRequest(params) {
+      return new Promise((resolve, reject) => {
+        this.axios
+          .get("tableList/getPrimaryKey", { params })
+          .then(({ data }) => {
+            let result;
+            if (data.result == "SUCCESS") {
+              const { map = {} } = data;
+              result = map.primaryKey || undefined;
+            } else {
+              result = undefined;
+            }
+            resolve(result);
+          })
+          .catch(err => {
+            reject(err);
+          });
+      });
     },
     /**
      * 判断是否渲染EditForm
@@ -297,7 +376,7 @@ export default {
      */
     showEditForm(row, column, $rowIndex) {
       if (!this.isMatchComponent || this.isNestTable || this.isScanMultiTable) return false;
-      if (this.isBatchEditing || this.isInlineEditing || this.isInlineAdding) {
+      if (this.isBatchEditing || this.isInlineAdding) {
         let matchObj = this.editColumnMap[column.property];
         if (!matchObj || !matchObj.matchItem || !matchObj.fieldItem) return false;
         // 批量编辑 未选择全部行编辑
@@ -305,12 +384,8 @@ export default {
           let matchIndex = this.checkedRows.findIndex(v => v[this.primaryKey] == row[this.primaryKey]);
           if (matchIndex < 0) return false;
         }
-        // 当行编辑
-        // if (this.isInlineEditing) {
-        //   let { index } = this.currentClickBtnInfo || {};
-        //   if ($rowIndex !== index) return false;
-        // }
-        if (this.isInlineEditing || this.isInlineAdding) {
+        // 新增
+        if (this.isInlineAdding) {
           if ($rowIndex !== 0) return false;
         }
         return matchObj.matchItem;
@@ -335,7 +410,11 @@ export default {
       let { fieldItem = {} } = matchObj || {};
       let defaultCombinationForm = {};
       if (!this.isInlineAdding) {
-        let originalRow = this.pageIndexOldtableData.find(item => item[this.primaryKey] == row[this.primaryKey]);
+        let originalRow = this.pageIndexOldtableData.find(item => {
+          let oldItemVal = utils.handleCurValue(item[this.primaryKey]);
+          let rowVal = utils.handleCurValue(row[this.primaryKey]);
+          return oldItemVal == rowVal
+        });
         defaultCombinationForm = this.setDefaultFormData(column.property, fieldItem, originalRow);
       }
       let tempFieldItem = JSON.parse(JSON.stringify(fieldItem));
@@ -357,7 +436,9 @@ export default {
           isPure: true,
           isOpenShortcut: false,
           cacheUniqueKey: this.cacheUniqueKey,
-          styleSetting: {}
+          styleSetting: {},
+          editFormApiConfig: this.editFormApiConfig,
+          btnList: this.btnList
         },
         on: {
           handleSubmit: this.handleSubmitEditForm,
@@ -376,33 +457,14 @@ export default {
      * @param {*} obj formData
      */
     handleSubmitEditForm(obj = {}) {
-      // 单行编辑
-      if (this.isInlineEditing || this.isInlineAdding) {
-        this.$emit('submitEditFormSuccess', obj);
-        return;
-      }
-
-      // 批量编辑
-      if (this.isBatchEditing) {
-        this.$emit('submitEditFormSuccessBatch', obj);
-        return;
-      }
+      this.$emit('submitEditFormSuccessBatch', obj);
     },
     /**
      * 单个form提交失败
      * @param {*} obj
      */
     banSubmit(obj) {
-      // 单行编辑
-      if (this.isInlineEditing || this.isInlineAdding) {
-        this.$emit('submitEditFormError');
-        return;
-      }
-      // 批量编辑
-      if (this.isBatchEditing) {
-        this.$emit('submitEditFormErrorBatch', obj);
-        return;
-      }
+      this.$emit('submitEditFormErrorBatch', obj);
     },
     formatFieldItem(fieldItem) {
       return Object.assign({}, fieldItem, {
@@ -457,7 +519,7 @@ export default {
           this.$emit('triggerSpinning', false);
           if (data.result !== 'SUCCESS') {
             this.isSaveForm = false;
-            this.$message.error(data.resultMsg);
+            this.$message.error(data.resultMsg || '保存失败');
             this.resetBatchEditRowStatus();
             return false;
           }
@@ -494,7 +556,14 @@ export default {
       return arr;
     },
     savaForm(formId, params) {
-      let url = `/form/editRows/update/${formId}`;
+      let handleEditFormSavaForm = this.editFormApiConfig?.handleEditFormSavaForm
+      if (!handleEditFormSavaForm || typeof handleEditFormSavaForm !== 'function') {
+        handleEditFormSavaForm = this.savaFormRequest
+      }
+      return handleEditFormSavaForm(params, { formId })
+    },
+    savaFormRequest(params, config) {
+      let url = `/form/editRows/update/${config.formId}`;
       return this.axios({
         method: 'post',
         url,

package/packages/big-table/src/utils/bigTableProps.js

@@ -58,37 +58,33 @@ const bigTableProps = {
   btnList: { type: Array, default: () => [] },
   spinning: Boolean,
   rowGroupSetting: { type: Object, default: () => ({}) },
-  inlineEditFormSubmitDone: Boolean,
   isInlineOperating: Boolean,
   inlineEditCurrentOperateBtnId: String,
   tableRefreshCache: { type: Object, default: () => ({}) }, // 记录需要刷新的列表，当切换到当前列表时更新
   userInfo: { type: Object, default: () => ({}) },
-  isInlineEditing: Boolean,
   isInlineAdding: Boolean,
-  isInlineSave: Boolean,
-  isInlineCancel: Boolean,
-  inlineError: Boolean,
-  resetInlineEdit: Function, // 重置状态（不包含编辑、新增状态)
-  resetEditRowStatus: Function, // 重置编辑行保存表单相关状态
+  isRowEditing: Boolean,
   pageIndexOldtableData: {
     // 原始数据
     type: Array,
     default: () => []
   },
   submitForm: Function,
-  isMatchComponent: Boolean,
+  isMatchComponent: { type: Boolean, default: true }, // 为了兼容低代码(组件内部)与二次开发平台(vuex)
   asyncCount: Boolean,
   showSettings: { type: Object, default: () => ({}) },
-  inlineFormData: { type: Object, default: () => ({}) },
-  inlineOriginalTableRow: { type: Object, default: () => ({}) },
-  filterDomPortal:{ // 表头筛选挂载的地方
+  filterDomPortal: { // 表头筛选挂载的地方
     type: String,
     default: "body"
   },
-  filterTopOffset:{ // 表头 top 调节
+  filterTopOffset: { // 表头 top 调节
     type: Number,
     default: 0
-  }
+  },
+  editFormApiConfig: Object, // 编辑表格api
+  defaultEditAllRow: Boolean,
+  editTableUid: [String, Number],
+  curBatchBtnData: { type: Object, default: () => ({}) }
 };
 
 export default bigTableProps;