cnhis-design-vue 0.3.5-beta → 0.3.8-beta

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

@@ -87,7 +87,7 @@
       :scroll-x="{ enabled: false }"
       :scroll-y="{ gt: 50 }"
       :row-style="getRowStyle"
-      :edit-config="{ trigger: 'manual', mode: 'row', autoClear: false, showIcon: false }"
+      :edit-config="state.editConfig"
       :expand-config="{
         lazy: true,
         accordion: columnConfig && columnConfig.accordion,
@@ -162,7 +162,7 @@ export default create({
 </script>
 
 <script lang="tsx" setup>
-import { computed, nextTick, onMounted, reactive, ref, useAttrs, watch, h, resolveComponent, onActivated, onUnmounted } from "vue";
+import { computed, nextTick, onMounted, reactive, ref, useAttrs, watch, isReactive, shallowReactive, onActivated, onUnmounted } from "vue";
 import { useRoute } from 'vue-router';
 import bigTableState from "./bigTableState";
 import bigTableProps from "./bigTableProps";
@@ -177,6 +177,9 @@ import TextOverTooltip from "./components/TextOverTooltip.vue";
 // import SvgIcon from '@/component/svg/index.vue';
 import SvgIcon from "./components/SvgIcon.vue";
 // import EditForm from './components/edit-form/EditForm.vue';
+import EditSelectTable from './components/edit-form/edit-select-table.vue'
+import EditInput from './components/edit-form/edit-input.vue'
+import EditSelect from './components/edit-form/edit-select.vue'
 import {
   NButton,
   NCheckbox,
@@ -191,7 +194,10 @@ import {
   NSwitch,
   NPopover,
   NDropdown,
-  NPopconfirm
+  NPopconfirm,
+  NSelect,
+  NPagination,
+  NEmpty
 } from "naive-ui";
 import { useMessage } from 'naive-ui'
 import CGrid from '~/grid';
@@ -351,6 +357,7 @@ const treeConfig = computed(() => {
   }
   return result;
 });
+
 const hideAllWrap = (e: any) => {
   const path = e.path || (e.composedPath && e.composedPath());
   const noWrap = (className: string) => {
@@ -373,7 +380,8 @@ const unBindDocumentClick = () => {
 }
 onMounted(() => {
   bindDocumentClick();
-  state.tableHeight = handleTableHeight(state, props);
+  // state.tableHeight = handleTableHeight(state, props);
+  state.tableHeight = '520px'
 
   // // 子列表在mounted后初始化 直接watch无法触发
   if (!props.isNestTable) return;
@@ -411,7 +419,6 @@ const loadColumn = (config: any) => {
   // this.hasOnlyIcon = config.hasOnlyIcon;
   let columns = formatColumns(config);
   columns = handleGroupColums(columns, props);
-  console.log("columns--------------", columns);
   xGrid.value && xGrid.value.reloadColumn(columns);
 
   setGroupTreeExpand();
@@ -422,7 +429,7 @@ const loadData = async (data: any) => {
   state.isShowEmpty = !data?.length;
 
   const list = JSON.parse(JSON.stringify(data));
-  console.log("list--------------", list);
+  // console.log("list--------------", list);
   let table = xGrid.value;
   if (!table) return;
   let formatList = setChecklist(list);
@@ -437,6 +444,14 @@ const loadData = async (data: any) => {
     await handleFormTheUniqueKey();
   }
 
+  formatList = formatList.map((v: any) => {
+    return {
+      ...v,
+      selectTableShow: false,
+      selectTableDisable: false
+    }
+  })
+
   // reloadData 替换 loadData 保存setting之后需要表格重新reload
   // loadData 加载数据
   // reloadData 加载数据并清除所有状态
@@ -504,7 +519,13 @@ const formatColumns = (map: any) => {
    */
   // 配置列表
   let { selectType } = getOtherConfigInit() || {};
-  let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable } = map;
+  let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable, isEdit = false, editConfig = {} } = map;
+  if (isEdit) {
+    state.editConfig = Object.assign(state.editConfig, editConfig, {
+      mode: 'cell', 
+      autoClear: true
+    })
+  }
   if (selectType) {
     // 有设置 selectType 强制可选。
     isBatchSelect = 1;
@@ -537,11 +558,9 @@ const formatColumns = (map: any) => {
       fixed: "left",
       align: "center",
       visible: isScanMultiTable || false,
-      width: "50",
+      width: "60",
       slots: {
-        header: () => {
-          return "操作";
-        },
+        header: () => "操作",
         default: scanMultiOperate,
       },
     },
@@ -567,14 +586,14 @@ const formatColumns = (map: any) => {
       visible: checkVisible,
       resizable: false,
       width: checkMinWidth,
-      // slots: selectType === 'checkbox' ? checkboxSlot : null,
+      slots: selectType === 'checkbox' ? checkboxSlot : null,
       // 修复 vxe-table升级3.x版本 原自定义checkbox样式失效
-      slots:
-        selectType === "checkbox"
-          ? {
-              checkbox: "tooltip_checkbox",
-            }
-          : null,
+      // slots:
+      //   selectType === "checkbox"
+      //     ? {
+      //         checkbox: "tooltip_checkbox",
+      //       }
+      //     : null,
       showOverflow: true,
     },
   ];
@@ -625,12 +644,17 @@ const formatColumns = (map: any) => {
       showOverflow: "title",
       treeNode: treeNode,
       type: type,
-      slots: {
-        default: (params: any) => {
-          return formatter(params, item);
+      // slots: {
+      //   default: (params: any) => {
+      //     return formatter(params, item);
+      //   },
+      // },
+      slots: isEdit ? {
+          edit: (params: any) => formatterEdit(params, item)
+        } : {
+          default: (params: any) => formatter(params, item)
         },
-      },
-      editRender: generateEditRender(item),
+      editRender: isEdit ? {} : generateEditRender(item)
     });
 
     if (filterField && !props.isNestTable && !isScanMultiTable) {
@@ -671,6 +695,27 @@ const formatColumns = (map: any) => {
   state.columnLen = currentColumns.filter((item: any) => item.visible).length;
   return columns;
 };
+const formatterEdit = (params: any, col: any) => {
+  let { row, column, $rowIndex, rowIndex } = params
+  let formType = column.formType || col.formType
+  if (formType === 'selectTable') {
+    const propsData = {
+      row,
+      col
+    }
+    return <EditSelectTable {...propsData} v-model={[row[col.columnName], 'value']} />
+  }
+  if (formType === 'input') {
+    return <EditInput v-model={[row[col.columnName], 'value']} />
+  }
+  if (formType === 'select') {
+    const propsData = {
+      col
+    } 
+    return <EditSelect {...propsData} v-model={[row[col.columnName], 'value']} />
+  }
+}
+
 // 表格渲染逻辑
 const formatter = (params: any, col: any) => {
   let { row, column, $rowIndex } = params;
@@ -763,7 +808,7 @@ const formatter = (params: any, col: any) => {
         {tileBtnList}
         {foldBtnList}
         {inlineBtnList}
-      </span>,
+      </span>
     ];
   }
 
@@ -1410,13 +1455,27 @@ const setCheckedMehod = (setChecked: any, row: any) => {
   }
   updateAddCheckedRows(row);
 }
+// 
+const getFormType = (field: string) => {
+  const obj = props.columnConfig.fieldList.find((v: any) => v.columnName === field)
+  return obj ? obj.formType || '' : ''
+}
 //行点击
 const handlerClickRow = (data: any) => {
-  console.log("data");
+  console.log("data.", data);
   if (isScanMultiTable.value || props.isInlineOperating) return false;
   if (vexutils.has(data?.row, GROUP_TITLE_KEY)) return false;
   if (state.isTriggerSelectionChange && state.isTree == 0) return false;
   let table = xGrid.value;
+
+  const formType = getFormType(data.column.field)
+  console.log('formType---', formType)
+  if (formType === 'selectTable') {
+    // table.clearActived().then(() => {
+      table.setActiveCell(data.row, data.column.field)
+    // })
+  }
+
   // 嵌套表与主表click切换时需要清除上次的选中
   isAboutNestTable.value && emit('resetNestLastClickTable', table);
 
@@ -1957,7 +2016,7 @@ const generateInlineBtnList = (row: any, index: any) => {
         size="small"
         text
       >
-        保存
+        {{default: () => '保存'}}
       </NButton>
       <NButton
         style={{ display: row.__isInlineEditing ? "inline-block" : "none" }}
@@ -1970,13 +2029,13 @@ const generateInlineBtnList = (row: any, index: any) => {
         size="small"
         text
       >
-        取消
+        {{default: () => '取消'}}
       </NButton>
     </span>,
   ];
 };
 // 按钮 jsx
-const getTileBtnList = (row: any, index: any) => {
+const getTileBtnList = (row: any, index: number) => {
   return [
     (row.tileBtnList?.length &&
       row.tileBtnList.map((btn: any, j: any) => {
@@ -2003,8 +2062,7 @@ const getTileBtnList = (row: any, index: any) => {
               //               {getBtnIcon(btn)}
               // {btn.showStyle === "only_icon" ? "" : handleName(btn)}
             >
-              {getBtnIcon(btn)}
-              {btn.showStyle === 'only_icon' ? '' : handleName(btn)}
+              {{default: () => [getBtnIcon(btn), btn.showStyle === 'only_icon' ? '' : handleName(btn)]}}
             </NButton>
           )
         );
@@ -2013,7 +2071,7 @@ const getTileBtnList = (row: any, index: any) => {
   ];
 };
 // 按钮事件
-const clickBtn = (row: any, btn: any, index: any, e: any, j: any) => {
+const clickBtn = (row: any, btn: any, index: number, e: any, j: any) => {
   e.preventDefault();
   e.stopPropagation();
   recordClickBtnInfo(row, index);
@@ -2052,7 +2110,7 @@ const getBtnIcon = (btn: any, mr = "8px") => {
   return [icon];
 };
 // 按钮 jsx
-const getFoldBtnList = (row: any, index: any) => {
+const getFoldBtnList = (row: any, index: number) => {
   const getOptions = () => {
     return row.foldBtnList.map((b: any, j: any) => {
       return {
@@ -2074,7 +2132,7 @@ const getFoldBtnList = (row: any, index: any) => {
         options={getOptions()}
       >
         <NButton size="small" style="margin-left: 8px">
-          更多 ...
+          {{default: () => '更多 ...'}}
         </NButton>
       </NDropdown>
     )) ||
@@ -2501,14 +2559,283 @@ defineExpose({
   clearChecked,
   setCurrentRow,
   loadColumn,
-  removeInsert
+  removeInsert,
+  xGrid
 })
 
 </script>
 <style lang="less" scoped>
-@import "./assets/style/table-base.less";
+.big-table {
+  position: relative;
+
+  &:deep(.img-wrap) {
+    padding: 2px 0;
+    line-height: 1;
+    height: 100%;
+    display: flex;
+    align-items: center;
+
+    img {
+      max-height: 100%;
+      object-fit: contain;
+      cursor: pointer;
+    }
+    &.img-circle {
+      img {
+        width: 28px;
+        border-radius: 50%;
+        object-fit: contain;
+      }
+    }
+  }
+  .bigTable-qr-span {
+    position: relative;
+    display: inline-block;
+    height: 100%;
+    .bigTable-qr-img {
+      max-height: 96%;
+    }
+    > span {
+      position: absolute;
+      top: 0;
+      left: 0;
+      justify-content: center;
+      align-items: center;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.7);
+      color: #fff;
+      display: none;
+      cursor: pointer;
+    }
+    &:hover {
+      > span {
+        display: inline-flex;
+      }
+    }
+  }
+
+  /* 行内表单样式 */
+  &:deep(.base-form) {
+    overflow: hidden !important;
+    display: flex;
+    align-items: center;
+    width: 100%;
+  }
+  &:deep(.base-form-content) {
+    width: 100%;
+  }
+  &:deep(textarea) {
+    height: 32px;
+    margin-bottom: 0;
+    resize: none;
+  }
+  &:deep(.formItem-select-multiple) {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    line-height: 40px;
+  }
+  /* 行内表单样式 */
+
+  &.mt {
+    margin-top: 26px;
+    height: calc(100% - 78px) !important;
+  }
+
+  &.expand-padding {
+    &:deep(.vxe-table .vxe-body--expanded-cell) {
+      padding-left: 66px !important;
+      padding-right: 66px !important;
+    }
+  }
+
+  th.vxe-header--column {
+    cursor: pointer;
+  }
+  .row-btn {
+    margin-right: 10px;
+  }
+  &:deep(.vxe-table) {
+    transform: translateZ(0);
+    .vxe-table--empty-content {
+      width: 100%;
+      height: 100%;
+      > div {
+        width: 100%;
+        height: 100%;
+        .no-data-tip {
+          display: inline-flex;
+        }
+      }
+    }
+    .col--checkbox,
+    .col--seq {
+      .vxe-cell {
+        padding: 0;
+        .vxe-checkbox--label {
+          padding-left: 0;
+        }
+      }
+    }
+    .vxe-cell .vxe-tree-cell {
+      height: 100%;
+    }
+
+    .scan-multi-delete {
+      color: #F06F64;
+    }
+
+    .vxe-table--header {
+      background-color: #f2f2f2;
+      .vxe-header--column .vxe-cell--title {
+        height: 100%;
+        line-height: unset;
+        width: 100%;
+      }
+    }
+    .vxe-table--footer-wrapper.body--wrapper,
+    .vxe-table--body-wrapper {
+      &::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+        background-color: #f2f2f2;
+      }
+      &::-webkit-scrollbar-thumb:hover {
+        background-color: #b2b2b2;
+      }
+    }
+    .vxe-footer--row .vxe-footer--column {
+      > .vxe-cell .vxe-cell--item {
+        height: 30px;
+        line-height: 30px;
+      }
+    }
+    .vxe-cell--checkbox.is--disabled {
+      .vxe-checkbox--icon {
+        display: none;
+      }
+    }
+  }
+  &:deep(.filter-box) {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    .text-over-tooltip-components {
+      max-width: calc(100% - 20px);
+    }
+    .vxe-filter--btn {
+      border-top-color: #c0c4cc;
+      border-right-color: #c0c4cc;
+    }
+    .vxe-filter--btn.active {
+      border-top-color: #35393c;
+      border-right-color: #35393c;
+    }
+    .vxe-filter--btn.checked {
+      border-top-color: #5585f5;
+      border-right-color: #5585f5;
+    }
+  }
+  &:deep(.disabled-checked-tips) {
+    position: absolute;
+    left: 6px;
+    top: 50%;
+    bottom: 0;
+    right: 0;
+    box-sizing: border-box;
+    width: 16px;
+    height: 16px;
+    margin-top: -8px;
+    overflow: hidden;
+    border-radius: 50%;
+    border: 2px solid #ff1818;
+    background: #fff;
+    &::after {
+      position: absolute;
+      content: '';
+      width: 16px;
+      height: 2px;
+      background-color: #ff1818;
+      transform: rotate(45deg);
+      transform-origin: 0 2px;
+      left: 0;
+      top: 0;
+    }
+  }
+}
+
+.refresh {
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  box-shadow: 0px 2px 4px 0px rgba(108, 108, 108, 0.13);
+  color: #5585f5;
+  font-size: 12px;
+  height: 27px;
+
+  position: absolute;
+  right: 0;
+  top: 6px;
+  z-index: 1;
+
+  padding-left: 14px;
+  padding-right: 14px;
+  border-top-left-radius: 14px;
+  border-bottom-left-radius: 14px;
+
+  cursor: pointer;
+}
+.refresh-row {
+  margin-left: 3px;
+  margin-bottom: 0;
+}
+
+.check-wrap {
+  background: #ffffe9;
+  display: block;
+  width: 100%;
+  line-height: 26px;
+  display: flex;
+  justify-content: center;
+
+  position: absolute;
+  margin-top: -26px;
+
+  .check-wrap-title,
+  .check-wrap-btn {
+    color: #000000;
+    font-size: 12px;
+    margin-bottom: 0px;
+    cursor: pointer;
+  }
+
+  .check-wrap-btn {
+    color: #5585f5;
+  }
+}
+
+.percent-wrap {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+  .percent-value {
+    line-height: 1;
+    margin-bottom: -4px;
+    margin-top: 4px;
+  }
+}
+.domPropsInnerHTML-span {
+  height: 100%;
+  &:deep(img) {
+    display: inline-block;
+    height: var(--tableImageHeight);
+    width: var(--tableImageWidth);
+  }
+}
 </style>
 
-<style lang="less">
-@import "./assets/style/table-global.less";
+<style lang="less" src="./assets/style/table-global.less">
 </style>

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

@@ -272,4 +272,10 @@ body {
     height: var(--tableImageHeight);
     width: var(--tableImageWidth);
   }
+}
+
+.select-table {
+  :deep(.n-base-select-menu__empty) {
+    display: none;
+  }
 }

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

@@ -164,4 +164,12 @@
     width: 25px;
     height: 20px;
   }
-}
+}
+
+.big-table {
+  .form-select-table {
+    .n-base-select-menu__empty {
+      display: none;
+    }
+  }
+}

package/packages/big-table/src/bigTableProps.ts

@@ -119,7 +119,7 @@ const bigTableProps = {
 
   // 曾经的mapActions
   resetInlineBatchEdit: Function,
-  resetBatchEditRowStatus: Function,
+  resetBatchEditRowStatus: Function
 };
 
 export default bigTableProps;

package/packages/big-table/src/bigTableState.ts

@@ -57,6 +57,7 @@ const bigTableState = {
   fieldLength: 0,
   originFormatList: [],
   isSaveForm: false,
+  editConfig: { trigger: 'manual', mode: 'cell', autoClear: false, showIcon: false }
 };
 
 export default bigTableState;

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

@@ -0,0 +1,19 @@
+<script lang="tsx">
+import { defineComponent, ref, reactive } from 'vue'
+import { NInput } from 'naive-ui'
+
+export default defineComponent({
+  name: 'EditInput',
+  inheritAttrs: false,
+  components: {
+    NInput
+  },
+  setup (props, { attrs, slots, emit }) {
+    
+    return () => [
+      <NInput {...attrs} />
+    ]
+  }
+})
+</script>
+<style lang="less" scoped></style>