cnhis-design-vue 3.0.3 → 3.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.3",
+  "version": "3.0.6",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {

package/packages/big-table/index.ts

@@ -2,21 +2,16 @@ import type { App } from "vue";
 // import XEUtils from "xe-utils";
 // 导入组件
 import BigTable from "./src/BigTable.vue"
-import FieldSet from './src/FieldSet.vue'
 
 // type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
 
 // 为组件提供 install 安装方法，供按需引入
 BigTable.install = function(app: App) {
   app.component(BigTable.name, BigTable);
-  app.component(FieldSet.name, FieldSet)
   // app.config.globalProperties.$utils = XEUtils;
 };
 
 // const CBigTable: SFCWithInstall<typeof BigTable> = BigTable; // 增加类型
 
-Object.assign(BigTable, {
-  FieldSet
-});
 // 默认导出组件
 export default BigTable;

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

@@ -176,9 +176,9 @@ import { SettingsSharp, SyncOutline, CopyOutline, CaretDown, CaretForward } from
 import NoData from "./components/NoData.vue";
 import TextOverTooltip from "./components/TextOverTooltip.vue";
 import SvgIcon from '@/component/svg/index.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 EditDate from './components/edit-form/edit-date.vue'
 import {
   NButton,
   NCheckbox,
@@ -271,7 +271,7 @@ const {
   recordClickBtnInfo,
   getInlineOpreateRow
 }: any = useBatchEditing(props, state, emit, xGrid);
-const { initEditTable, activeMethod, deleteRow, onClickSelectTable, onUpdateInput, getDefaultValue } = useEdit(props, state, emit, xGrid)
+const { initEditTable, activeMethod, deleteRow, onClickSelectTable, onFormChange, getDefaultValue } = useEdit(props, state, emit, xGrid)
 
 const { 
   isAboutNestTable,
@@ -377,7 +377,7 @@ const unBindDocumentClick = () => {
 }
 onMounted(() => {
   bindDocumentClick();
-  state.tableHeight = handleTableHeight(state, props);
+  state.tableHeight = handleTableHeight(state, props) || 'auto';
 
   // // 子列表在mounted后初始化 直接watch无法触发
   if (!props.isNestTable) return;
@@ -706,13 +706,6 @@ const formatColumns = (map: any) => {
 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']} onClickSelectTable={onClickSelectTable} />
-  // }
   if (formType === 'custom') {
     return col.slotFn(params)
   }
@@ -722,14 +715,17 @@ const formatterEdit = (params: any, col: any) => {
     index: $rowIndex
   }
   if (formType === 'input' || formType === 'number') {
-    return <EditInput {...propsData} type={formType} v-model={[row[col.columnName], 'value']} onUpdateInput={onUpdateInput} />
+    return <EditInput {...propsData} type={formType} v-model={[row[col.columnName], 'value']} onFormChange={onFormChange} />
   }
   if (formType === 'select') {
-    return <EditSelect {...propsData} v-model={[row[col.columnName], 'value']} onSetOptions={(options: any[]) => row[`${col.columnName}_options`] = options} />
+    return <EditSelect {...propsData} v-model={[row[col.columnName], 'value']} onSetOptions={(options: any[]) => row[`${col.columnName}_options`] = options} onFormChange={onFormChange} />
+  }
+  if (formType === 'date') {
+    return <EditDate {...propsData} v-model={[row[col.columnName], 'formattedValue']} onFormChange={onFormChange} />
   }
 }
 const getEditBtn = (row: any, col: any, index: number) => {
-  return col.tileBtnList.map((btn: any) => {
+  return col.tileBtnList?.map((btn: any) => {
     if (btn.settingObj[0].trigger_type === 'DELETE') {
       return <NPopconfirm
         onPositiveClick={() => deleteRow(row, col, index)}

package/packages/big-table/src/assets/iconfont/iconfont.less

@@ -1,7 +1,8 @@
+/*
 @font-face {
-  font-family: "iconfont"; /* Project id  */
+  font-family: "iconfont";
   src: url('iconfont.ttf?t=1631151904509') format('truetype');
-}
+}*/
 
 .iconfont {
   font-family: "iconfont" !important;

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

@@ -41,9 +41,11 @@
     display: inline-block;
   }
 
+  /*
   .sort-icon-asc {
     background-image: url('../img/icon-asc.png');
   }
+  */
 
   .sort-text {
     margin-left: 11px;
@@ -52,9 +54,11 @@
     color: rgba(0, 0, 0, 0.8);
   }
 
+  /*
   .sort-icon-desc {
     background-image: url('../img/icon-desc.png');
   }
+  */
 
   .filter-header {
     padding: 0 13px;

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

@@ -41,8 +41,7 @@ const bigTableEmits: string[] = [
   "selectionChangeLocal",
   "switchBtnOnChange",
   "asyncTableChange",
-  // "clickSelectTable"
-  "updateInput"
+  "formChange"
 ];
 
 export default bigTableEmits;

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

@@ -0,0 +1,42 @@
+<script lang="tsx">
+import { defineComponent, ref, reactive, resolveComponent } from 'vue'
+import { NDatePicker } from 'naive-ui'
+
+export default defineComponent({
+  name: 'EditDate',
+  inheritAttrs: false,
+  components: {
+    NDatePicker
+  },
+  props: {
+    col: {
+      type: Object,
+      default: () => ({})
+    },
+    row: {
+      type: Object,
+      default: () => ({})
+    },
+    index: {
+      type: [Number, Object],
+      default: 0
+    }
+  },
+  emits: ['formChange'],
+  setup (props, { attrs, slots, emit }) {
+    const onConfirm = (value: number | [number, number] | null, formattedValue: string | [string, string] | null) => {
+      console.log('时间选择->', value)
+      emit('formChange', { value, row: props.row, column: props.col, index: props.index })
+    }
+    const config = {
+      type: props.col.type || 'datetime',
+      clearable: props.col.clearable || true,
+      disabled: props.col.disabled || false,
+      valueFormat: props.col.valueFormat || 'yyyy-MM-dd HH:mm:ss',
+      to: false
+    }
+    return () => <NDatePicker {...attrs} {...config} onConfirm={onConfirm} />
+  }
+})
+</script>
+<style lang="less" scoped></style>

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

@@ -27,10 +27,10 @@ export default defineComponent({
       default: 0
     }
   },
-  emits: ['updateInput'],
+  emits: ['formChange'],
   setup (props, { attrs, slots, emit }) {
     const onUpdateValue = (value: number | string | null) => {
-      emit('updateInput', { value, row: props.row, column: props.col, index: props.index })
+      emit('formChange', { value, row: props.row, column: props.col, index: props.index })
     }
     return () => props.type === 'input' ? <NInput {...attrs} onUpdateValue={onUpdateValue } /> : <NInputNumber {...attrs} onUpdateValue={onUpdateValue} />
   }

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

@@ -11,14 +11,18 @@ export default defineComponent({
   props: {
     col: {
       type: Object,
-      default: () => {}
+      default: () => ({})
     },
     row: {
       type: Object,
-      default: () => {}
+      default: () => ({})
+    },
+    index: {
+      type: [Number, Object],
+      default: 0
     }
   },
-  emits: ['setOptions'],
+  emits: ['setOptions', 'formChange'],
   setup (props, { attrs, slots, emit }) {
     
     const state = reactive({
@@ -40,6 +44,10 @@ export default defineComponent({
 
     setOptions()
 
+    const onUpdateValue = (value: any[] | string | number | null) => {
+      emit('formChange', { value, row: props.row, column: props.col, index: props.index })
+    }
+
     return () => [
       <NSelect
         {...attrs} 
@@ -49,6 +57,7 @@ export default defineComponent({
         filterable
         to={false}
         placeholder="请选择"
+        onUpdateValue={onUpdateValue}
       />
     ]
   }

package/packages/big-table/src/hooks/useEdit.ts

@@ -71,8 +71,8 @@ export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
     xGrid.value.clearActived()
   }
 
-  const onUpdateInput = ({ value, row, column }: {value: number | string | null, row: any, column: any}) => {
-    emit('updateInput', { value, row, column })
+  const onFormChange = ({ value, row, column }: {value: number | string | null, row: any, column: any}) => {
+    emit('formChange', { value, row, column })
   }
 
   const getDefaultValue = (params: any, item: any) => {
@@ -94,7 +94,7 @@ export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
     activeMethod,
     deleteRow,
     onClickSelectTable,
-    onUpdateInput,
+    onFormChange,
     getDefaultValue
   }
 }

package/packages/button-print/src/ButtonPrint.vue

@@ -58,17 +58,16 @@ interface Props {
   previewText?: string
   formatEditText?: string
   identityVerificationTitle?: string
-  params: any[],
-  hisParams: any
+  params?: any[],
   prevFn?: Function
   verifyUser?: Function
   queryPrintFormatByNumber: Function
   queryTemplateParams?: Function
   strategy?: string
-  versionType?: number | string
+  printParams?: any[]
 }
 const props = withDefaults(defineProps<Props>(), {
-  // baseUrl: '',
+  params: () => ([]),
   btnText: '打印',
   printText: '直接打印',
   previewText: '打印预览',
@@ -79,7 +78,6 @@ const props = withDefaults(defineProps<Props>(), {
   queryPrintFormatByNumber: () => Promise.resolve({}),
   queryTemplateParams: () => Promise.resolve({}),
   strategy: 'MULTI',
-  versionType: '2'
 });
 const emit = defineEmits(['success', 'error']);
 
@@ -140,36 +138,8 @@ const prevFnError = () => {
   };
   emit('error', error);
 }
-const getHisParams = (index: number = 0) => {
-  const { reportid = '280' } = (props.hisParams as any);
-  const { id, name } = (state.templateParams as any);
-  return {
-    reportid,
-    formatid: state.currentFormatId || id,
-    formatname: name,
-    param: props.params[index]
-  };
-}
-const getOnceHisParams = () => {
-  const { reportid = '280' } = (props.hisParams as any);
-  const { id, name } = (state.templateParams as any);
-  const obj: any = {}
-  Object.keys((props.params as any)[0]).forEach(v => {
-    obj[v] = [];
-    props.params.forEach((k: any) => {
-      obj[v].push(k[v]);
-    });
-    obj[v] = obj[v].join(',');
-  });
-  return {
-    reportid,
-    formatid: state.currentFormatId || id,
-    formatname: name,
-    param: obj
-  };
-}
 const getPrintParams = (index: number = 0) => {
-  const params = state.printParams[index];
+  const params = props.printParams?.length ? props.printParams[index] : state.printParams[index];
   return JSON.stringify(params);
 }
 const getOnceParams = () => {
@@ -215,55 +185,30 @@ const handleClickPrint = () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        if (props.strategy === 'MULTI') {
-          for (let i = 0; i < props.params.length; i++) {
-            const params = getHisParams(i);
-            printInstance[printFn](7, params)
-              .then((res: any) => {
-                console.log(res, '777777777777');
-              })
-              .catch((error:any) => {
-                console.log(error, 'error777');
-              });
-          }
-        } else {
-          const params = getOnceHisParams();
-          printInstance[printFn](7, params)
-            .then((res: any) => {
-              console.log(res, '777777777777');
-            })
-            .catch((error:any) => {
-              console.log(error, 'error777');
-            });
-        }
-      } else {
-        if (props.strategy === 'MULTI') {
-          // 循环多条
-          for (let i = 0; i < state.printParams.length; i++) {
-            const queryParams = {
-              formatId: state.currentFormatId,
-              templateId: getTemplateIdByFormatId(state.currentFormatId),
-              params: getPrintParams(i)
-            };
-            printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
-          }
-        } else {
-          // 聚合一条
+      if (props.strategy === 'MULTI') {
+        // 循环多条
+        for (let i = 0; i < state.printParams.length; i++) {
           const queryParams = {
             formatId: state.currentFormatId,
             templateId: getTemplateIdByFormatId(state.currentFormatId),
-            params: getOnceParams()
+            params: getPrintParams(i)
           };
-          printInstance.printDirect(
-            queryParams,
-            (res: any) => {
-              callLocalServicesSuccessCb(res, 'print');
-            },
-            callLocalServicesErrorCb
-          );
+          printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
         }
+      } else {
+        // 聚合一条
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId(state.currentFormatId),
+          params: getOnceParams()
+        };
+        printInstance.printDirect(
+          queryParams,
+          (res: any) => {
+            callLocalServicesSuccessCb(res, 'print');
+          },
+          callLocalServicesErrorCb
+        );
       }
     })
     .finally(() => {
@@ -277,31 +222,19 @@ const handleClickPreview = async () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const params = props.strategy === 'MULTI' ? getHisParams() : getOnceHisParams();
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        printInstance[printFn](8, params)
-          .then((res: any) => {
-            console.log(res, 88888888);
-          })
-          .catch((error: any) => {
-            console.log(error, 'error888');
-          });
-      } else {
-        const params = props.strategy === 'MULTI' ? getPrintParams() : getOnceParams();
-        const queryParams = {
-          formatId: state.currentFormatId,
-          templateId: getTemplateIdByFormatId(state.currentFormatId),
-          params
-        };
-        printInstance.preview(
-          queryParams,
-          (res: any) => {
-            callLocalServicesSuccessCb(res, 'preview');
-          },
-          callLocalServicesErrorCb
-        );
-      }
+      const params = props.strategy === 'MULTI' ? getPrintParams() : getOnceParams();
+      const queryParams = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId(state.currentFormatId),
+        params
+      };
+      printInstance.preview(
+        queryParams,
+        (res: any) => {
+          callLocalServicesSuccessCb(res, 'preview');
+        },
+        callLocalServicesErrorCb
+      );
     })
     .finally(() => {
       state.visible = false;
@@ -314,19 +247,7 @@ const handleClickEdit = () => {
       return Promise.reject();
     })
     .then(() => {
-      if (props.versionType == 1 || props.versionType == 3) {
-        const params = props.strategy === 'MULTI' ? getHisParams() : getOnceHisParams();
-        const printFn = props.versionType == 1 ? 'handleHisPrint' : 'handleOldHisPrint'
-        printInstance[printFn](9, params)
-          .then((res: any) => {
-            console.log(res, 999999);
-          })
-          .catch((error: any) => {
-            console.log(error, 'error999');
-          });
-      } else {
-        state.identityVerification.visible = true;
-      }
+      state.identityVerification.visible = true;
     })
     .finally(() => {
       state.visible = false;
@@ -383,12 +304,6 @@ const setOptions = () => {
     children
   })
 }
-const initHIS = (formatListResult: any) => {
-  state.formatList = formatListResult ? formatListResult.list.filter((item: any) => item.printmark == 1) : [];
-  setOptions();
-  state.currentFormatId = getDefaultFormatId(state.formatList, 'printmark');
-  state.templateParams = state.formatList[0];
-}
 const formatFormatList = (list: any[]): any => {
   let formatList: any[] = [];
 
@@ -459,7 +374,7 @@ const formatParams = ({ customizeDataset = [], param = [] }, params: any[] = [])
 }
 const initCRM = async (formatListResult: any) => {
   state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
-  setOptions();
+  console.log('formatListResult', formatListResult)
   state.currentFormatId = getDefaultFormatId(state.formatList, 'defaultFlag');
 
   if (!state.currentFormatId) {
@@ -488,11 +403,7 @@ const init = async () => {
 
   instantiatePrintSDK();
   const formatListResult = await props.queryPrintFormatByNumber()
-  if (props.versionType == 1 || props.versionType == 3) {
-    initHIS(formatListResult);
-  } else {
-    await initCRM(formatListResult);
-  }
+  await initCRM(formatListResult);
 
   setLoaded();
 

package/packages/field-set/index.ts

@@ -0,0 +1,15 @@
+import type { App } from "vue";
+// 导入组件
+import FieldSet from './src/FieldSet.vue'
+
+// type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
+
+// 为组件提供 install 安装方法，供按需引入
+FieldSet.install = function(app: App) {
+  app.component(FieldSet.name, FieldSet);
+};
+
+// const CBigTable: SFCWithInstall<typeof BigTable> = BigTable; // 增加类型
+
+// 默认导出组件
+export default FieldSet;

package/packages/{big-table → field-set}/src/FieldSet.vue

@@ -128,7 +128,6 @@ export default create({
 </script>
 <script lang="ts" setup>
 import { reactive, onMounted, computed, ref, toRefs } from "vue";
-import { useRoute, useRouter } from "vue-router";
 import draggable from "vuedraggable";
 import { NButton, NCheckbox, NSpin, NTooltip } from "naive-ui";
 
@@ -170,7 +169,6 @@ type Istate = {
   };
   fields: Ifields[];
 };
-const route = useRoute();
 
 const emit = defineEmits(["onSave", "onClose"]);
 
@@ -216,10 +214,6 @@ const leftStyle = (ele: Ifields) => {
 
 const isMiddleAndAdmin = computed(() => props.menuSource == "middle");
 
-const isMenuSource = computed(() => {
-  return route.fullPath.includes("middleListDetail");
-});
-
 const showCheckBox = (key: string) => {
   return state.fields.some((i: Ifields) => Object.prototype.hasOwnProperty.call(i, key));
 };

package/packages/index.ts

@@ -2,6 +2,7 @@ import type { App } from "vue";
 // 导入组件
 import { default as CGrid } from './grid';
 import { default as CBigTable } from './big-table';
+import { default as CFieldSet } from './field-set';
 import { default as CDragLayout } from './drag-layout';
 import { default as CButtonPrint } from './button-print';
 
@@ -9,6 +10,7 @@ import { default as CButtonPrint } from './button-print';
 const components: any[] = [
   CGrid,
   CBigTable,
+  CFieldSet,
   CDragLayout,
   CButtonPrint
 ];
@@ -23,6 +25,7 @@ const install = function(app: App) {
 export {
   CGrid,
   CBigTable,
+  CFieldSet,
   CDragLayout,
   CButtonPrint
 }