cnhis-design-vue 3.0.1 → 3.0.2

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

@@ -23,11 +23,8 @@
     </NDropdown>
 
     <IdentityVerification
-      :visible.sync="state.identityVerification.visible"
-      :printConfig="printConfig"
-      :baseUrl="baseUrl"
-      :verifyUserUrl="verifyUserUrl"
-      :identityVerificationTitle="identityVerificationTitle"
+      v-model="state.identityVerification.visible"
+      v-bind="$attrs"
       @success="verifiySuccess"
     ></IdentityVerification>
   </span>
@@ -47,51 +44,41 @@ import { ChevronDown, Reload } from "@vicons/ionicons5";
 import { useMessage } from 'naive-ui'
 import type { DropdownOption } from 'naive-ui'
 import Print from './utils/print.es.min.js';
-// import vClickoutside from '@/utils/clickoutside';
-import vexutils from '@/utils/vexutils.js';
-// import type { Props } from './interfaces'
 import IdentityVerification from './components/IdentityVerification.vue';
-import axios from 'axios'
 import moment from 'moment';
 // const Print:any = import.meta.globEager('./utils/print.es.min.js')['./utils/print.es.min.js'].default;
 
 (window as any).$message = useMessage()
 let printInstance: any = null;
-let httpFn: any = null;
 
 // 在.vue文件中使用导入的interface会报错，提示要使用字面量类型，当前在github上vue的issue已经有这个问题了，目前还没解决
 interface Props {
-  baseUrl: string
   btnText?: string
   printText?: string
   previewText?: string
   formatEditText?: string
   identityVerificationTitle?: string
-  authorizationKey: string
-  templateNumber: number | string
   params: any[],
   hisParams: any
   prevFn?: Function
-  verifyUserUrl?: string
-  getPrintFormatByNumberUrl?: string
-  getTemplateParamsUrl?: string
+  verifyUser?: Function
+  queryPrintFormatByNumber: Function
+  queryTemplateParams?: Function
   strategy?: string
-  printConfig?: any
   versionType?: number | string
 }
 const props = withDefaults(defineProps<Props>(), {
-  baseUrl: '',
+  // baseUrl: '',
   btnText: '打印',
   printText: '直接打印',
   previewText: '打印预览',
   formatEditText: '格式编辑',
   identityVerificationTitle: '打印服务身份校验',
   prevFn: () => Promise.resolve(),
-  verifyUserUrl: '/verifyUser',
-  getPrintFormatByNumberUrl: '/getPrintFormatByNumber',
-  getTemplateParamsUrl: '/getTemplateParams',
+  verifyUser: () => Promise.resolve(),
+  queryPrintFormatByNumber: () => Promise.resolve({}),
+  queryTemplateParams: () => Promise.resolve({}),
   strategy: 'MULTI',
-  printConfig: () => {},
   versionType: '2'
 });
 const emit = defineEmits(['success', 'error']);
@@ -378,23 +365,6 @@ const instantiatePrintSDK = () => {
   if (printInstance) return false;
   printInstance = new Print();
 }
-const queryFormatList = () => {
-  const { templateNumber, authorizationKey, baseUrl, getPrintFormatByNumberUrl, versionType } = props;
-  const suffix = [1, 3].includes(+versionType) ? `jsessionids=${vexutils.cookie.get('jsessionids') || '31e5fc0e-955f-4c89-9679-39c43d0171321636163291241'}` : `authorizationKey=${authorizationKey}`;
-  const url = `${baseUrl}${getPrintFormatByNumberUrl}?number=${templateNumber}&${suffix}`;
-  return httpFn
-    .get(url)
-    .then(async ({ data = {} }) => {
-      if ((data as any).result !== 'SUCCESS') {
-        (window as any).$message.error((data as any).resultMsg || '参数异常，请联系管理员');
-        return false;
-      }
-      return data;
-    })
-    .catch((e: any) => {
-      return false;
-    });
-}
 const getDefaultFormatId = (list: any[], key: string | number) => {
   if (!list?.length) return '';
   let findDefault = list.find(item => item[key] == 1);
@@ -444,24 +414,6 @@ const requestError = () => {
 
   return false;
 }
-const queryTemplateParams = () => {
-  const { templateNumber, authorizationKey, baseUrl, getTemplateParamsUrl } = props;
-  const { templateId } = state.formatList[0] || {};
-  const url = `${baseUrl}${getTemplateParamsUrl}?number=${templateNumber}&templateId=${templateId}&authorizationKey=${authorizationKey}`;
-
-  return httpFn
-    .get(url)
-    .then(async ({ data = {} }) => {
-      if ((data as any).result !== 'SUCCESS') {
-        (window as any).$message.error((data as any).resultMsg || '参数异常，请联系管理员');
-        return false;
-      }
-      return (data as any)?.obj || {};
-    })
-    .catch((e: any) => {
-      return false;
-    });
-}
 const formatDefaultVal = (i: any, tableVal?: any) => {
   let val = i.defaultValue || '';
   let tVal = tableVal;
@@ -518,43 +470,7 @@ const initCRM = async (formatListResult: any) => {
     requestError();
     return;
   }
-  let templateParamsResult = await queryTemplateParams();
-  // let templateParamsResult = {
-  //   "param": [],
-  //   "customizeDataset": [
-  //     {
-  //       "dataSetting": [
-  //         {
-  //           "selectFieldList": [
-  //             {
-  //               "fieldName": "name",
-  //               "type": "TEXT"
-  //             },
-  //             {
-  //               "fieldName": "age",
-  //               "type": "NUMBER"
-  //             },
-  //             {
-  //               "fieldName": "money",
-  //               "type": "NUMBER"
-  //             }
-  //           ],
-  //           "jsonType": "jsonObject",
-  //           "required": false,
-  //           "downloadFields": ""
-  //         }
-  //       ],
-  //       "name": "结果集1",
-  //       "defaultJson": {
-  //         "money": 0,
-  //         "name": "",
-  //         "age": 0
-  //       },
-  //       "customize": true,
-  //       "key": 1
-  //     }
-  //   ]
-  // }
+  let templateParamsResult = (await props.queryTemplateParams())?.obj || {};
 
   if (templateParamsResult) {
     state.templateParams = templateParamsResult;
@@ -571,56 +487,7 @@ const init = async () => {
   setTimeoutSpin();
 
   instantiatePrintSDK();
-  let config: any = {
-    withCredentials: false,
-    timeout: 5000
-  };
-  let printUrlPrefix = props?.printConfig?.printUrlPrefix;
-  if (printUrlPrefix) {
-    config.baseURL = printUrlPrefix;
-  }
-  httpFn = axios.create({
-    ...config
-  });
-  const formatListResult = await queryFormatList();
-  // const formatListResult = {
-  //   "result": "SUCCESS",
-  //   "code": 0,
-  //   "resultMsg": "",
-  //   "list": [],
-  //   "obj": [
-  //     {
-  //       "number": "170testtemp",
-  //       "name": "170公有模板",
-  //       "format": [
-  //         {
-  //           "number": "170testtemp",
-  //           "defaultFlag": 0,
-  //           "printType": "1",
-  //           "rowNum": 1,
-  //           "name": "170公有格式1",
-  //           "id": "1420212788840570880",
-  //           "templateId": "1420212316842958848",
-  //           "privateValue": 1
-  //         },
-  //         {
-  //           "number": "170testtemp",
-  //           "defaultFlag": 0,
-  //           "printType": "1",
-  //           "rowNum": 2,
-  //           "name": "测试格式名称",
-  //           "id": "1420242022380281856",
-  //           "templateId": "1420212316842958848",
-  //           "privateValue": 1
-  //         }
-  //       ],
-  //       "id": "1420212316842958848"
-  //     }
-  //   ],
-  //   "total": 0,
-  //   "recordsTotal": 0,
-  //   "recordsFiltered": 0
-  // }
+  const formatListResult = await props.queryPrintFormatByNumber()
   if (props.versionType == 1 || props.versionType == 3) {
     initHIS(formatListResult);
   } else {

package/packages/button-print/src/components/IdentityVerification.vue

@@ -3,7 +3,7 @@
     preset="dialog"
     :title="identityVerificationTitle"
     class="standard-modal standard-modal-white authentication-modal"
-    :show="visible"
+    :show="modelValue"
     :close-on-esc="false"
     :show-icon="false"
     :style="{ width: style.width, maxHeight: style.height, overflowY: 'auto' }"
@@ -35,30 +35,24 @@ export default {
 import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue'
 import { NButton, NModal, NForm, NFormItem, NInput, FormRules, FormInst } from 'naive-ui'
 import { useMessage } from 'naive-ui'
-import axios from 'axios';
-import crypto from '@/utils/crypto.js';
 // const crypto:any = import.meta.globEager('./utils/crypto.js');
 
 (window as any).$message = useMessage()
 
-let httpFn: any = null;
 const DEFAULT_FORM = {
   account: '',
   password: ''
 };
 
 const props = withDefaults(defineProps<{
-  visible: boolean
-  baseUrl: string
-  verifyUserUrl?: string
+  verifyUser?: Function
   identityVerificationTitle?: string
-  printConfig?: any
+  modelValue: boolean
 }>(), {
-  verifyUserUrl: '/verifyUser',
-  printConfig: () => {}
+  verifyUser: () => Promise.resolve(),
 })
 
-const emit = defineEmits(['update:visible', 'success']);
+const emit = defineEmits(['update:modelValue', 'success']);
 
 let form = reactive(JSON.parse(JSON.stringify(DEFAULT_FORM)))
 const rules: FormRules = {
@@ -72,27 +66,15 @@ const style = {
 const formRef = ref<FormInst | null>(null)
 
 const handleClickClose = () => {
-  emit('update:visible', false);
+  emit('update:modelValue', false);
 }
-const submit = () => {
-  const url = `${props.baseUrl}${props.verifyUserUrl}`;
-
-  return httpFn({
-    method: 'POST',
-    url,
-    data: `loginName=${form.account}&password=${crypto.encrypt(form.password)}`
-  })
-    .then(async ({ data = {} }) => {
-      if ((data as any).result !== 'SUCCESS') {
-        (window as any).$message.error((data as any).resultMsg);
-        return false;
-      }
-      emit('success', (data as any).map?.token);
-      return data;
-    })
-    .catch((e: any) => {
-      return false;
-    });
+const submit = async () => {
+  const { data = {} } = await props.verifyUser(form)
+  if (data.result !== 'SUCCESS') {
+    (window as any).$message.error(data.resultMsg)
+    return false
+  }
+  emit('success', data.map?.token)
 }
 const handleClickSubmit = () => {
   formRef.value?.validate((errors) => {
@@ -106,20 +88,9 @@ const handleClickSubmit = () => {
 }
 
 onMounted(() => {
-  let config: any = {
-    withCredentials: false,
-    timeout: 5000
-  };
-  let printUrlPrefix = props?.printConfig?.printUrlPrefix;
-  if (printUrlPrefix) {
-    config.baseURL = printUrlPrefix;
-  }
-  httpFn = axios.create({
-    ...config
-  });
 })
 
-watch(() => props.visible,
+watch(() => props.modelValue,
   (val: any) => {
     if (val) return;
     form = JSON.parse(JSON.stringify(DEFAULT_FORM));

package/packages/grid/index.ts

@@ -1,14 +1,15 @@
 import type { App } from "vue";
 
 // 导入组件
-import Grid, { VXETable } from "./src/Grid"
+// import Grid, { VXETable } from "./src/Grid"
+import Grid from "./src/Grid"
 
 // type SFCWithInstall<T> = T & { install(app: App): void }; // vue 安装
 
 // 为组件提供 install 安装方法，供按需引入
 Grid.install = function(app: App) {
+  // app.use(VXETable);
   app.component(Grid.name, Grid);
-  app.use(VXETable);
 };
 
 // const CGrid: SFCWithInstall<typeof Grid> = Grid; // 增加类型

package/packages/grid/src/Grid.tsx

@@ -1,11 +1,12 @@
 import { defineComponent } from "vue"
 import 'xe-utils'
-import VXETable, { Grid } from 'vxe-table'
-import 'vxe-table/lib/style.css'
+// 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 { VXETable }
 
 export default defineComponent(create({
   name: "Grid",

package/packages/index.ts

@@ -12,7 +12,6 @@ const components: any[] = [
   DragLayout,
   ButtonPrint
 ];
-
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 const install = function(app: App) {
   // 遍历注册全局组件
@@ -22,11 +21,11 @@ const install = function(app: App) {
 };
 
 export {
-  Grid,
-  BigTable,
-  DragLayout,
-  ButtonPrint
-};
+  Grid as CGrid,
+  BigTable as CBigTable,
+  DragLayout as CDragLayout,
+  ButtonPrint as CButtonPrint
+}
 
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装