cnhis-design-vue 3.0.2 → 3.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.2",
+  "version": "3.0.5",
   "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

@@ -729,7 +729,7 @@ const formatterEdit = (params: any, col: any) => {
   }
 }
 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/button-print/src/ButtonPrint.vue

@@ -58,17 +58,15 @@ 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
 }
 const props = withDefaults(defineProps<Props>(), {
-  // baseUrl: '',
+  params: () => ([]),
   btnText: '打印',
   printText: '直接打印',
   previewText: '打印预览',
@@ -79,7 +77,6 @@ const props = withDefaults(defineProps<Props>(), {
   queryPrintFormatByNumber: () => Promise.resolve({}),
   queryTemplateParams: () => Promise.resolve({}),
   strategy: 'MULTI',
-  versionType: '2'
 });
 const emit = defineEmits(['success', 'error']);
 
@@ -140,34 +137,6 @@ 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];
   return JSON.stringify(params);
@@ -215,55 +184,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 +221,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 +246,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 +303,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 +373,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 +402,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/grid/index.ts

@@ -1,14 +1,16 @@
 import type { App } from "vue";
 
 // 导入组件
-// import Grid, { VXETable } from "./src/Grid"
+import 'vxe-table/lib/style.css'
+import 'xe-utils'
+import VXETable from 'vxe-table'
 import Grid from "./src/Grid"
 
 // type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
 
 // 为组件提供 install 安装方法，供按需引入
 Grid.install = function(app: App) {
-  // app.use(VXETable);
+  app.use(VXETable);
   app.component(Grid.name, Grid);
 };
 

package/packages/grid/src/Grid.tsx

@@ -1,17 +1,12 @@
 import { defineComponent } from "vue"
-import 'xe-utils'
-// import VXETable, { Grid } from 'vxe-table'
-import { Grid } from 'vxe-table'
-// import 'vxe-table/lib/style.css'
 import create from '@/core/create.js';
 import { useMethods } from './hooks'
 
-// export { VXETable }
 
 export default defineComponent(create({
   name: "Grid",
   setup(props: any, { attrs, slots }: any) {
-    const renderVN = () => <Grid ref="xGrid" { ...attrs }>{slots}</Grid>
+    const renderVN = () => <vxe-grid ref="xGrid" { ...attrs }>{slots}</vxe-grid>
     return {
       ...useMethods(),
       renderVN

package/packages/grid/src/hooks.ts

@@ -156,8 +156,7 @@ export const useMethods = () => {
   const funcs: any = {}
   methodKeys.forEach(name => {
     funcs[name] = (...args: any[]) => {
-      const $xGrid: any = xGrid.value
-      return $xGrid && $xGrid[name](...args)
+      return xGrid.value && xGrid.value[name](...args)
     }
   })
 

package/packages/index.ts

@@ -1,16 +1,18 @@
 import type { App } from "vue";
 // 导入组件
-import { default as Grid } from './grid';
-import { default as BigTable } from './big-table';
-import { default as DragLayout } from './drag-layout';
-import { default as ButtonPrint } from './button-print';
+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';
 
 // 存储组件列表
 const components: any[] = [
-  Grid,
-  BigTable,
-  DragLayout,
-  ButtonPrint
+  CGrid,
+  CBigTable,
+  CFieldSet,
+  CDragLayout,
+  CButtonPrint
 ];
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function(app: App) {
@@ -21,10 +23,11 @@ const install = function(app: App) {
 };
 
 export {
-  Grid as CGrid,
-  BigTable as CBigTable,
-  DragLayout as CDragLayout,
-  ButtonPrint as CButtonPrint
+  CGrid,
+  CBigTable,
+  CFieldSet,
+  CDragLayout,
+  CButtonPrint
 }
 
 export default {

package/tsconfig.node.json

@@ -4,5 +4,5 @@
     "module": "esnext",
     "moduleResolution": "node"
   },
-  "include": ["vite.config.ts"]
+  "include": ["vite.config.ts", "build/*.ts"]
 }