Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev

- 在TabsCardDocument组件中新增工作档案标签页配置
- 设置标签页名称为'工作档案'
- 配置标签页对应表单ID为'1966386366515343361'
- 设置计算高度为200像素- 固定搜索条件file_main_type为5

.env.dev

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径 注：/api 正常不需要 当前是访问演示环境nginx转发用
-VITE_BASE_URL='http://10.28.117.100'
+VITE_BASE_URL='https://demo.jeelowcode.com/api'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server

src/App.vue

@@ -63,7 +63,7 @@ watch(
 </script>
 <template>
   <ConfigGlobal :size="currentSize">
-    <div class="h-100% w-100%" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
+    <div class="h-100% w-100%" style="overflow-y: auto;" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
       <RouterView />
     </div>
     <routerSearch />

src/api/design/table/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import { encryptAES } from '@/components/LowDesign/src/utils/aes'
+import download from '@/utils/download'
 
 //获取表单开发列表
 export const getDbList = (data) => {
@@ -158,6 +159,11 @@ export const exportExcelData = (tableId, data) => {
   return request.download({ url: `/jeelowcode/excel/exportExcel/${tableId}`, method: 'POST', data })
 }
 
+//导出Excel表数据
+export const exportExcelDataCustom = (explain,tableId, data) => {
+  return request.download({ url: `/jeelowcode/excel/exportExcelCustom/${tableId}`, method: 'POST', data }).then((data) => download.excel(data, explain, 'xlsx'))
+}
+
 //下载导入模板
 export const downloadImportTemplate = (tableId) => {
   return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` })

src/components/LowDesign/src/LowTable/index.vue

@@ -18,6 +18,18 @@
           v-bind="userVBind"
           class="w-100%"
         ></userSelect>
+   </span>
+      <span prop="delegateDictId" style="display:none">
+    
+    <DicTableSelect
+    id="costomDictSelect"
+      :column="distSelectColumn"
+      size="default"
+      type="add"
+      prop="fields_7897245"
+      :scope="dictSelectScope"
+      @set-form-data="handleSetFormData"
+    ></DicTableSelect>
    </span>
     <!-- 顶部统计 -->
     <div
@@ -383,12 +395,108 @@ interface Props {
   dicRowKey?: string //dicTable模式 行数据的 Key
 }
 
+const dictSelectScope = {
+        "key": 0,
+        "value": "",
+        "column": {
+            "type": "dicTableSelect",
+            "controlType": "select",
+            "label": "表格选择框",
+            "fixedSearch":{
+              "approveStatusName":"已审批"
+            },
+            "separator": " | ",
+            "multiple": true,
+            "display": true,
+            "span": 12,
+            "disabled": false,
+            "required": false,
+            "hideLabel": false,
+            "i18nCode": "fields_7897245",
+            "dictTable": "1959187451673116674",
+            "dictCode": "id",
+            "dictText": "personName",
+            "dictTableColumn": [
+              "personName",
+              "personAge",
+              "personSex",
+              "mobile",
+              "approveStatusName"
+            ],
+            "prop": "fields_7897245",
+            "dataType": "string",
+            "className": "control-dicTableSelect control-fields_7897245 ",
+            "props": {
+                "lable": "personName",
+                "value": "id"
+            },
+            "rules": [
+
+            ]
+        },
+        "size": "default",
+        "disabled": false
+    }
+
+const distSelectColumn = {
+        "type": "dicTableSelect",
+        "controlType": "select",
+        "multiple": true,
+        "label": "表格选择框",
+        "separator": " | ",
+        "display": true,
+        "span": 12,
+        "disabled": false,
+        "fixedSearch":{
+              "approveStatusName":"已审批"
+            },
+        "required": false,
+        "hideLabel": false,
+        "i18nCode": "fields_7897245",
+        "dictTable": "1959187451673116674",
+        "dictCode": "id",
+        "dictText": "personName",
+        "dictTableColumn": [
+          "personName",
+          "personAge",
+          "personSex",
+          "mobile",
+          "approveStatusName"
+          ]
+        ,
+        "prop": "fields_7897245",
+        "dataType": "string",
+        "className": "control-dicTableSelect control-fields_7897245 ",
+        "props": {
+            "lable": "personName",
+            "value": "id"
+        },
+        "rules": [
+
+        ]
+    }
+
 const props = withDefaults(defineProps<Props>(), {
   model: 'default',
   fixedSearch: () => {
     return {}
   }
 })
+const handleSetFormData = (key, val) => {
+  console.log(key);
+  console.log(val);
+  // 在这里添加其他处理逻辑
+  useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + val, {
+  }).then(res => {
+    if (res.length > 0) {
+        message.success('下发成功')
+        useFun.refreshChange()
+    } else {
+      message.error(res.message)
+    }
+  })
+};
+
 const userVBind = {
   prop: 'delegateUserId',
   type: 'edit',

src/components/LowDesign/src/shareControl/DicTableSelect.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="dic-table-select-box w-100%">
+    {{ JSON.stringify(props) }}
     <div
       class="table-input pos-relative"
       :class="[{ disabled }, type, size]"
@@ -273,9 +274,9 @@ const getCurrTableSelect = (type?) => {
   const dicObj = {}
   const textList: string[] = []
   const ids = tableRef.value.tableSelect.map((item) => {
-    if (item[props.column.dictText]) {
+    if (item[props.column.dictCode]) {
-      dicObj[item[dicCode.value]] = item[props.column.dictText]
+      dicObj[item[dicCode.value]] = item[props.column.dictCode]
-      textList.push(item[props.column.dictText])
+      textList.push(item[props.column.dictCode])
     }
     return item[dicCode.value]
   })

src/components/LowDesign/src/utils/defaultUseUtil.ts

@@ -7,6 +7,7 @@ import { encryptAES, decryptAES } from '@/components/LowDesign/src/utils/aes'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useI18n } from '@/hooks/web/useI18n';
 import router from '@/router/index'
+import {exportExcelDataCustom} from '@/api/design/table'
 
 const message = useMessage() // 消息弹窗
 
@@ -18,6 +19,7 @@ export default {
    * @param options 请求配置 如：{ params:{ text:'测试' } }
   */
   requestApi: (Method, url, options) => callApiFun(Method, url, options),
+  exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data),
   cloneDeep, //深拷贝
   listToTree,//列表转树结构
   formatDate,//时间格式化

src/components/Verifition/src/Verify/VerifyPoints.vue

@@ -171,7 +171,7 @@ const canvasClick = (e) => {
         token: backToken.value
       }
       reqCheck(data).then((res) => {
-        if (res?.repCode == '0000') {
+        if (res.repCode == '0000') {
           barAreaColor.value = '#4cae4c'
           barAreaBorderColor.value = '#5cb85c'
           text.value = t('captcha.success')
@@ -228,14 +228,14 @@ const getPictrue = async () => {
     captchaType: captchaType.value
   }
   const res = await getCode(data)
-  if (res?.repCode == '0000') {
+  if (res.repCode == '0000') {
-    pointBackImgBase.value = res?.repData?.originalImageBase64
+    pointBackImgBase.value = res.repData.originalImageBase64
-    backToken.value = res?.repData?.token
+    backToken.value = res.repData.token
-    secretKey.value = res?.repData?.secretKey
+    secretKey.value = res.repData.secretKey
-    poinTextList.value = res?.repData?.wordList || []
+    poinTextList.value = res.repData.wordList
-    text.value = t('captcha.point') + '【' + poinTextList.value?.join(',') + '】'
+    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
   } else {
-    text.value = res?.repMsg
+    text.value = res.repMsg
   }
 }
 //坐标转换函数

src/components/Verifition/src/Verify/VerifySlide.vue

@@ -287,7 +287,7 @@ const end = () => {
       token: backToken.value
     }
     reqCheck(data).then((res) => {
-      if (res?.repCode == '0000') {
+      if (res.repCode == '0000') {
         moveBlockBackgroundColor.value = '#5cb85c'
         leftBarBorderColor.value = '#5cb85c'
         iconColor.value = '#fff'
@@ -364,13 +364,13 @@ const getPictrue = async () => {
     captchaType: captchaType.value
   }
   const res = await getCode(data)
-  if (res?.repCode == '0000') {
+  if (res.repCode == '0000') {
-    backImgBase.value = res?.repData?.originalImageBase64
+    backImgBase.value = res.repData.originalImageBase64
-    blockBackImgBase.value = res?.repData?.jigsawImageBase64
+    blockBackImgBase.value = res.repData.jigsawImageBase64
-    backToken.value = res?.repData?.token
+    backToken.value = res.repData.token
-    secretKey.value = res?.repData?.secretKey
+    secretKey.value = res.repData.secretKey
   } else {
-    tipWords.value = res?.repMsg
+    tipWords.value = res.repMsg
   }
 }
 </script>

src/views/Login/components/LoginForm.vue

@@ -1,31 +1,56 @@
 <template>
-  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
+  <el-form
-    class="login-form login-form-default" label-position="top" label-width="120px" size="large">
+    v-show="getShow"
+    ref="formLogin"
+    :model="loginData.loginForm"
+    :rules="LoginRules"
+    class="login-form login-form-default"
+    label-position="top"
+    label-width="120px"
+    size="large"
+  >
     <el-row style="margin-right: -10px; margin-left: -10px">
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item>
-          <LoginFormTitle style="width: 100%" />
+          <LoginFormTitle style="width: 100%"/>
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
-          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
+          <el-input
-            :prefix-icon="iconHouse" link type="primary" />
+            v-model="loginData.loginForm.tenantName"
+            :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse"
+            link
+            type="primary"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="username">
-          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
+          <el-input
-            :prefix-icon="iconAvatar" />
+            v-model="loginData.loginForm.username"
+            :placeholder="t('login.usernamePlaceholder')"
+            :prefix-icon="iconAvatar"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
         <el-form-item prop="password">
-          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
+          <el-input
-            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
+            v-model="loginData.loginForm.password"
+            :placeholder="t('login.passwordPlaceholder')"
+            :prefix-icon="iconLock"
+            show-password
+            type="password"
+            @keyup.enter="getCode()"
+          />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
+      <el-col
+        :span="24"
+        style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
+      >
         <el-form-item>
           <el-row justify="space-between" style="width: 100%">
             <el-col :span="6">
@@ -41,21 +66,26 @@
       </el-col>
       <el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col">
         <el-form-item>
-          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
+          <XButton
-            @click="getCode()" />
+            :loading="loginLoading"
+            :title="t('login.login')"
+            class="w-[100%]"
+            type="primary"
+            @click="getCode()"
+          />
           <div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end">
             <el-dropdown @command="easyCommand">
               <div class="mt--2px cursor-pointer">
                 <el-text type="primary">
                   <span class="text-14px">{{ t('login.otherLogin') }}</span>
-                  <Icon :size="16" icon="iconamoon:arrow-down-2-light" />
+                  <Icon :size="16" icon="iconamoon:arrow-down-2-light"/>
                 </el-text>
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
                   <template v-for="item in easyDropdownList" :key="item.label">
                     <el-dropdown-item :command="item">
-                      <Icon :size="16" :icon="item.icon" />
+                      <Icon :size="16" :icon="item.icon"/>
                       <span>{{ item.label }}</span>
                     </el-dropdown-item>
                   </template>
@@ -65,8 +95,13 @@
           </div>
         </el-form-item>
       </el-col>
-      <Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
+      <Verify
-        @success="handleLogin" />
+        ref="verify"
+        :captchaType="captchaType"
+        :imgSize="{ width: '400px', height: '200px' }"
+        mode="pop"
+        @success="handleLogin"
+      />
       <template v-if="!loginType">
         <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
           <!-- <el-form-item>
@@ -92,8 +127,15 @@
         <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
           <el-form-item>
             <div class="w-[100%] flex justify-center">
-              <Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
+              <Icon
-                class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
+                v-for="(item, key) in socialList"
+                :key="key"
+                :icon="item.icon"
+                :size="50"
+                class="anticon cursor-pointer"
+                color="#999"
+                @click="doSocialLogin(item.type)"
+              />
             </div>
           </el-form-item>
         </el-col>
@@ -102,18 +144,18 @@
   </el-form>
 </template>
 <script lang="ts" setup>
-import { ElLoading } from 'element-plus'
+import {ElLoading} from 'element-plus'
 import LoginFormTitle from './LoginFormTitle.vue'
-import type { RouteLocationNormalizedLoaded } from 'vue-router'
+import type {RouteLocationNormalizedLoaded} from 'vue-router'
 
-import { useIcon } from '@/hooks/web/useIcon'
+import {useIcon} from '@/hooks/web/useIcon'
 
 import * as authUtil from '@/utils/auth'
-import { usePermissionStore } from '@/store/modules/permission'
+import {usePermissionStore} from '@/store/modules/permission'
 import * as LoginApi from '@/api/login'
-import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
+import {LoginStateEnum, useFormValid, useLoginState} from './useLogin'
 
-defineOptions({ name: 'LoginForm' })
+defineOptions({name: 'LoginForm'})
 
 interface Props {
   loginType?: 'easy'
@@ -121,15 +163,15 @@ interface Props {
 
 const props = defineProps<Props>()
 
-const { t } = useI18n()
+const {t} = useI18n()
 const message = useMessage()
-const iconHouse = useIcon({ icon: 'ep:house' })
+const iconHouse = useIcon({icon: 'ep:house'})
-const iconAvatar = useIcon({ icon: 'ep:avatar' })
+const iconAvatar = useIcon({icon: 'ep:avatar'})
-const iconLock = useIcon({ icon: 'ep:lock' })
+const iconLock = useIcon({icon: 'ep:lock'})
 const formLogin = ref()
-const { validForm } = useFormValid(formLogin)
+const {validForm} = useFormValid(formLogin)
-const { setLoginState, getLoginState } = useLoginState()
+const {setLoginState, getLoginState} = useLoginState()
-const { currentRoute, push } = useRouter()
+const {currentRoute, push} = useRouter()
 const permissionStore = usePermissionStore()
 const redirect = ref<string>('')
 const loginLoading = ref(false)
@@ -161,7 +203,7 @@ const socialList = [
   // { icon: 'ant-design:dingtalk-circle-filled', type: 20 },
   // { icon: 'ant-design:github-filled', type: 0 },
   // { icon: 'ant-design:alipay-circle-filled', type: 0 },
-  { icon: 'bx:planet', type: 100 },
+  {icon: 'bx:planet', type: 100},
 ]
 
 const easyDropdownList = [
@@ -177,15 +219,15 @@ const easyDropdownList = [
     type: LoginStateEnum.QR_CODE,
     code: 'page'
   },
-  { label: t('login.btnWechat'), icon: 'ant-design:wechat-filled', type: 30, code: 'url' },
+  {label: t('login.btnWechat'), icon: 'ant-design:wechat-filled', type: 30, code: 'url'},
   {
     label: t('login.btnDingtalk'),
     icon: 'ant-design:dingtalk-circle-filled',
     type: 20,
     code: 'url'
   },
-  { label: t('login.btnGitHub'), icon: 'ant-design:github-filled', type: 0, code: 'url' },
+  {label: t('login.btnGitHub'), icon: 'ant-design:github-filled', type: 0, code: 'url'},
-  { label: t('login.btnAlipay'), icon: 'ant-design:alipay-circle-filled', type: 0, code: 'url' }
+  {label: t('login.btnAlipay'), icon: 'ant-design:alipay-circle-filled', type: 0, code: 'url'}
 ]
 
 const easyCommand = (row) => {
@@ -227,13 +269,11 @@ const getCookie = () => {
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
   const website = location.host
-  try {
   const res = await LoginApi.getTenantByWebsite(website)
   if (res) {
     loginData.loginForm.tenantName = res.name
     authUtil.setTenantId(res.id)
   }
-  } catch (e) { }
 }
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
@@ -268,7 +308,7 @@ const handleLogin = async (params) => {
     if (redirect.value.indexOf('sso') !== -1) {
       window.location.href = window.location.href.replace('/login?redirect=', '')
     } else {
-      push({ path: redirect.value || permissionStore.addRouters[0].path })
+      push({path: redirect.value || permissionStore.addRouters[0].path})
     }
   } finally {
     loginLoading.value = false
@@ -287,7 +327,7 @@ const doSocialLogin = async (type: number) => {
       await getTenantId()
       // 如果获取不到，则需要弹出提示，进行处理
       if (!authUtil.getTenantId()) {
-        await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
+        await message.prompt('请输入租户名称', t('common.reminder')).then(async ({value}) => {
           const res = await LoginApi.getTenantIdByName(value)
           authUtil.setTenantId(res)
         })
@@ -316,7 +356,7 @@ watch(
   }
 )
 onMounted(() => {
-  if (redirect.value && import.meta.env.VITE_DEFAULT_SSO == 'true') {
+  if(redirect.value && import.meta.env.VITE_DEFAULT_SSO =='true'){
     //默认
     doSocialLogin(100)
   }

src/views/bpm/processInstance/detail/index.vue

@@ -173,6 +173,8 @@ const handleAudit = async (task, pass) => {
   getDetail()
 }
 
+
+
 const printPage = async () => {
  
  const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', 

src/views/document/TabsCardDocument.vue

@@ -61,6 +61,13 @@ const tabsPaneList = ref([
     calcHeight: 200,
     fixedSearch: {file_main_type: 4}
   },
+  {
+    label: '工作档案',
+    name: 'workArchive',
+    formId: '1966386366515343361',
+    calcHeight: 200,
+    fixedSearch: {file_main_type: 5}
+  },
 ])
 
 // 定义点击tab的事件动作

vite.config.ts

@@ -32,7 +32,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       // 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
       proxy: {
         ['/admin-api']: {
-          target: 'http://10.28.117.100:48080',
+          target: env.VITE_BASE_URL,
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),