agilebuilder-ui 1.0.63 → 1.0.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-user-tree-inline/src/search-result.vue

@@ -74,7 +74,7 @@
 					</div>
 				</template>
 			</el-table-column>
-			<el-table-column
+			<!-- <el-table-column
 					v-if="multiple"
 					:label="$t('superGrid.index')"
 					align="center"
@@ -83,25 +83,32 @@
 				<template v-slot="scope">
 					{{ scope.$index + 1 }}
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 			<el-table-column
 					:label="$t('departmentUserTreeInline.name')"
 					:width="130"
 					prop="name"
 			>
 				<template v-slot="scope">
-          <span
-		          v-if="scope.row.enName && scope.row.enName.trim() !== ''"
-		          :title="scope.row.name + '(' + scope.row.enName + ')'"
-		          class="ellipsis cell--span"
-          >{{ scope.row.name + '(' + scope.row.enName + ')' }}</span
-          >
-					<span v-else :title="scope.row.name" class="ellipsis cell--span">{{
-							scope.row.name
-						}}</span>
+					<div v-if="scope.row.enName && scope.row.enName.trim() !== ''">
+						<div :title="scope.row.name +'('+scope.row.enName+')' +'['+scope.row.loginName+']'">
+						<span>{{ scope.row.name+'('+scope.row.enName+')' }}[{{ scope.row.loginName }}]</span>
+						</div>
+						<div style="color:#ccc" :title="getDeptName(scope.row)">
+						{{ getDeptName(scope.row) }}
+						</div>
+					</div>
+					<div v-else>
+						<div :title="scope.row.name +'['+scope.row.loginName+']'">
+						<span>{{ scope.row.name }}[{{ scope.row.loginName }}]</span>
+						</div>
+						<div style="color:#ccc" :title="getDeptName(scope.row)">
+						{{ getDeptName(scope.row) }}
+						</div>
+					</div>
 				</template>
 			</el-table-column>
-			<el-table-column
+			<!-- <el-table-column
 					:label="$t('departmentUserTreeInline.loginName')"
 					:width="110"
 					prop="loginName"
@@ -132,7 +139,7 @@
 	          }}</span
           >
 				</template>
-			</el-table-column>
+			</el-table-column> -->
 			<!--由于保密要求，邮箱不能显示，需要脱敏处理，暂时注释掉，不显示-->
 			<!-- <el-table-column
 							:label="$t('departmentUserTreeInline.email')"
@@ -143,27 +150,6 @@
 								<span class="ellipsis cell--span" :title="scope.row.email">{{ scope.row.email }}</span>
 							</template>
 						</el-table-column> -->
-			<el-table-column
-        :label="$t('departmentUserTreeInline.superiorDeptNameFullPath')"
-        :width="130"
-        prop="superiorDeptNameFullPath"
-      >
-				<template v-slot="scope">
-          <span :title="scope.row.superiorDeptNameFullPath" class="ellipsis cell--span">{{ scope.row.superiorDeptNameFullPath }}</span>
-        </template>
-      </el-table-column>
-			<el-table-column
-					v-if="containBranch"
-					:label="$t('departmentUserTreeInline.branch')"
-					:width="130"
-					prop="subCompanyName"
-			>
-				<template v-slot="scope">
-          <span :title="scope.row.subCompanyName" class="ellipsis cell--span">{{
-		          scope.row.subCompanyName
-	          }}</span>
-				</template>
-			</el-table-column>
 		</el-table>
 	</div>
 </template>
@@ -269,6 +255,19 @@ export default {
 				return dept.id === queryDept.id
 			}
 		},
+		getDeptName(row) {
+			let deptName = row.superiorDeptNameFullPath
+			if (deptName) {
+				return deptName
+			}
+			if (this.language && this.language !== 'cn') {
+				deptName = row.mainDepartmentEnName
+			}
+			if (deptName) {
+				return deptName
+			}
+			return row.mainDepartmentName
+		}
 	},
 	emits: ['removeUser', 'addUser', 'selectResult', 'resultRowDblclick'],
 }

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -26,6 +26,10 @@
     >
       <template v-if="descriptionAttribute">
         <div v-if="optionWidth > 0" :style="{ width: optionWidth + 'px' }">
+			<el-option 
+				v-if="baseProps.multiple !== undefined && baseProps.multiple === true && optionItems && optionItems.length > 0 " 
+				:label="$t('superGrid.selectAll')" value="saveAll" 
+			/>
           <el-option
 		          v-for="item in optionItems"
 		          :key="item.value"
@@ -42,31 +46,40 @@
             </div>
           </el-option>
         </div>
-        <el-option
-		        v-for="item in optionItems"
-				:key="item.value"
-		        v-else
-		        :label="item._label_"
-		        :title="item._label_ + item._description_"
-		        :value="item[valueAttribute]"
-        >
-          <span style="float: left">{{ item._label_ }}</span>
-          <span
-		          style="
-              float: right;
-              color: #8492a6;
-              font-size: 13px;
-              margin-left: 30px;
-            "
-          >{{ item._description_ }}</span
-          >
-        </el-option>
+		<div v-else>
+			<el-option 
+				v-if="baseProps.multiple !== undefined && baseProps.multiple === true && optionItems && optionItems.length > 0 " 
+				:label="$t('superGrid.selectAll')" value="saveAll" 
+			/>
+			<el-option
+					v-for="item in optionItems"
+					:key="item.value"
+					:label="item._label_"
+					:title="item._label_ + item._description_"
+					:value="item[valueAttribute]"
+			>
+			<span style="float: left">{{ item._label_ }}</span>
+			<span
+					style="
+				float: right;
+				color: #8492a6;
+				font-size: 13px;
+				margin-left: 30px;
+				"
+			>{{ item._description_ }}</span
+			>
+			</el-option>
+		</div>
       </template>
       <template v-else>
         <div
 		        v-if="optionWidth > 0"
 		        :style="{ width: optionWidth + 'px', position: 'relative' }"
         >
+			<el-option 
+				v-if="baseProps.multiple !== undefined && baseProps.multiple === true && optionItems && optionItems.length > 0 " 
+				:label="$t('superGrid.selectAll')" value="saveAll" 
+			/>
           <el-option
 		          v-for="item in optionItems"
 		          :key="item.value"
@@ -74,13 +87,18 @@
 		          :value="item[valueAttribute]"
           />
         </div>
-        <el-option
-			v-for="item in optionItems"
-			:key="item.value"
-			v-else
-			:label="item._label_"
-			:value="item[valueAttribute]"
-        />
+		<div v-else>
+			<el-option 
+				v-if="baseProps.multiple !== undefined && baseProps.multiple === true && optionItems && optionItems.length > 0 " 
+				:label="$t('superGrid.selectAll')" value="saveAll" 
+			/>
+			<el-option
+				v-for="item in optionItems"
+				:key="item.value"
+				:label="item._label_"
+				:value="item[valueAttribute]"
+			/>
+		</div>
       </template>
     </el-select>
   </span>
@@ -405,11 +423,28 @@ export default {
 		},
 		// 必须有该方法，否则无法给字段赋值
 		inputValue(newValue) {
+			 let isClickSaveAll = false
+			if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true && newValue && newValue.indexOf('saveAll') >= 0) {
+				// 表示点击了全选选项
+				isClickSaveAll = true
+				if (newValue.length - 1 >= this.optionItems.length) {
+				// 表示需要取消全选
+				newValue = []
+				} else {
+				// 表示需要全选
+				const allValues = []
+				for (let i = 0; i < this.optionItems.length; i++) {
+					const item = this.optionItems[i]
+					allValues.push(item[this.valueAttribute])
+				}
+				newValue = allValues
+				}
+			}
 			this.$emit('update:value', newValue)
 			if (this.remote && (newValue === null || newValue === undefined || newValue === '')) {
 				this.remoteQueryMethod(newValue)
 			}
-			this.setValues(newValue)
+			this.setValues(newValue, isClickSaveAll)
 		},
 		packageDynamicDataSourceInfo(dynamicDataSourceCode, param) {
 			return new Promise((resolve, reject) => {
@@ -594,11 +629,11 @@ export default {
 					? '_label_'
 					: this.valueAttribute
 		},
-		setValues(newValue) {
+		setValues(newValue, isClickSaveAll) {
 			if (this.valueSetOptions && this.valueSetOptions.length > 0) {
 				if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
 					// 多选时
-					this.setColumnValueWhenMulti(newValue)
+					this.setColumnValueWhenMulti(newValue, isClickSaveAll)
 				} else {
 					// 单选时
 					this.valueSetOptions.forEach((columnInfo) => {
@@ -673,7 +708,7 @@ export default {
 			})
 		},
 		// 多选下拉框时处理增加tag、减少tag时，映射字段赋值问题
-		setColumnValueWhenMulti(newValue) {
+		setColumnValueWhenMulti(newValue, isClickSaveAll) {
 			// 是否添加tag
 			let isAddTag = false
 			let removeTag
@@ -709,19 +744,89 @@ export default {
 			if (isAddTag) {
 				// 表示是增加tag
 				const isRemove = false
-				const lastSelectTag = newValue[newValue.length - 1]
-				const items = this.optionItems.filter(
+				if (isClickSaveAll) {
+				// 全选
+					this.setAllTagValue(isRemove)
+				} else {
+					const lastSelectTag = newValue[newValue.length - 1]
+					const items = this.optionItems.filter(
 						item => item[this.valueAttribute] === lastSelectTag
-				)
-				if (items && items.length > 0) {
-					this.setTagValue(null, isRemove, items[0])
+					)
+					if (items && items.length > 0) {
+						this.setTagValue(null, isRemove, items[0])
+					}
 				}
 			} else {
 				// 表示是减少tag
 				const isRemove = true
-				this.setTagValue(removeTag, isRemove)
+				if (isClickSaveAll) {
+					this.setAllTagValue(isRemove)
+				} else {
+					this.setTagValue(removeTag, isRemove)
+				}
 			}
 		},
+		setAllTagValue(isRemove) {
+			if (this.valueSetOptions && this.valueSetOptions.length > 0) {
+				this.valueSetOptions.forEach(columnInfo => {
+				const sourceColumnName = columnInfo.columnName
+				if (sourceColumnName !== this.valueAttribute) {
+					let targetColumnName = null
+					const targetColumnInfo = columnInfo.valueColumn
+					if (targetColumnInfo) {
+					targetColumnName = targetColumnInfo.name
+					if (this.isSql === true) {
+						targetColumnName = targetColumnInfo.dbColumnName
+						targetColumnName = getPropNameWhenJoinTable(
+						targetColumnName,
+						this.isJoinTable,
+						this.tableName
+						)
+					}
+					}
+					let value
+					if (targetColumnName) {
+					if (isRemove) {
+						// 移除tag
+						value = null
+					} else {
+						// 添加tag
+						let originalValue = ''
+						if (this.optionItems && this.optionItems.length > 0) {
+						this.optionItems.forEach(selectItem => {
+							const addValue = selectItem[sourceColumnName]
+							if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+							originalValue = originalValue + ',' + addValue
+							} else {
+							originalValue = addValue
+							}
+						})
+						value = originalValue
+						}
+					}
+					}
+					this.setTargetColumnValue(sourceColumnName, targetColumnName, value)
+				}
+				})
+			}
+		},
+		setTargetColumnValue(sourceColumnName, targetColumnName, value) {
+			if (
+				this.entity &&
+					targetColumnName &&
+					targetColumnName !== null &&
+					targetColumnName !== ''
+			) {
+				setEntityFieldValue(this.entity, targetColumnName, value)
+			}
+			this.$emit('set-value', {
+				value: value,
+				sourceColumnName: sourceColumnName,
+				targetColumnName: targetColumnName,
+				options: this.optionItems,
+				valueAttribute: this.valueAttribute
+			})
+		},
 		// 根据tag参数设置映射字段的值
 		setTagValue(tag, isRemove, selectItem) {
 			if (this.valueSetOptions && this.valueSetOptions.length > 0) {
@@ -765,21 +870,7 @@ export default {
 								}
 							}
 						}
-						if (
-								this.entity &&
-								targetColumnName &&
-								targetColumnName !== null &&
-								targetColumnName !== ''
-						) {
-							setEntityFieldValue(this.entity, targetColumnName, value)
-						}
-						this.$emit('set-value', {
-							value: value,
-							sourceColumnName: sourceColumnName,
-							targetColumnName: targetColumnName,
-							options: this.optionItems,
-							valueAttribute: this.valueAttribute
-						})
+						this.setTargetColumnValue(sourceColumnName, targetColumnName, value)
 					}
 				})
 			}

package/packages/super-grid/src/dynamic-input.vue

@@ -1379,7 +1379,7 @@ export default {
       // console.log('multiselectChange1---arr=', arr)
       this.extendParams = selectedItem
       let isSaveAll = false
-      if (arr && arr.length > 0) {
+      if (arr && arr.length > 0 && this.type === 'multiselect' && !this.isDynamicDataSourceSource()) {
         const saveAll = 'saveAll'
         if (arr.indexOf(saveAll) !== -1) {
           const length = arr.length

package/packages/super-grid/src/normal-column.vue

@@ -142,6 +142,7 @@
             :show-value="$escapeHtml(getLabel(pageGridData[scope.$index], scope.$index))"
             :value="getCellValue(pageGridData[scope.$index])"
             :additional-param-map="additionalParamMap"
+            @prohibitToEdit="prohibitToEdit"
         /></span>
         <span
           v-else-if="

package/packages/super-grid/src/super-grid.vue

@@ -3062,6 +3062,7 @@ export default {
 			if (entity) {
 				if (entity.isForceUpdate) {
           this.$emit('fn-prohibit-to-edit', entity)
+          this.$emit('prohibitToEdit', entity)
         }
         for (const key in entity) {
           // console.log('key', key)

package/src/api/sso-service.js

@@ -89,6 +89,20 @@ function isPasswordExpired(username, password) {
   )
 }
 
+function isPasswordExpiredWithValidateCode(username, password, validateCode, imageCodeKey) {
+  const usernamePasswordToken = {
+    username,
+    password,
+    validateCode,
+    imageCodeKey
+  }
+  return request.post(
+    window.$vueApp.config.globalProperties.baseAPI + '/sso/is-password-expired-with-validate-code',
+    usernamePasswordToken
+  )
+}
+
+
 /** 更新密码 */
 function updatePassword(data) {
   return request.put(
@@ -213,5 +227,6 @@ export default {
   isLoginTimeOut,
   getUserPermissionMenusBySystemCode,
   loginWithValidateCode,
-  getDevPlatformPermissions
+  getDevPlatformPermissions,
+  isPasswordExpiredWithValidateCode
 }

package/src/i18n/langs/cn.js

@@ -162,7 +162,8 @@ const cn = {
         removeUser: '移除用户',
         email: '邮箱',
         loginName: '登录名',
-    		superiorDeptNameFullPath: '组织全路径'
+        superiorDeptNameFullPath: '组织全路径',
+        user: '用户'
     },
     // 工作组树
     workgroupTree: {

package/src/i18n/langs/en.js

@@ -164,7 +164,8 @@ const en = {
         removeUser: 'Remove User',
         email: 'Email',
         loginName: 'Login Name',
-    		superiorDeptNameFullPath: 'Department full path'
+        superiorDeptNameFullPath: 'Department full path',
+        user: 'User'
     },
     // 工作组树
     workgroupTree: {

package/src/store/modules/user.js

@@ -1,19 +1,13 @@
 import ssoService from '../../api/sso-service'
 import {
   getUsername,
-  removeAllLanguages,
+  setUsername, removeUsername, removeCurrentUser, clearPermission,
   removeAllThemes,
-  removeCurrentUser,
   removeDevpPermissions,
-  removeLanguage,
   removeTheme,
-  removePublishControl,
-  removeToken,
-  removeUsername,
   setCurrentUser,
   setLanguage,
   setToken,
-  setUsername,
   removeProjectSettings,
   removeProjectCode,
   setTheme
@@ -22,10 +16,9 @@ import {
 import {
   getMenus,
   getPermissions,
-  removeMenus,
-  removePermissions,
   setMenus,
-  setPermissions
+  setPermissions,
+  removeAllSystemPermissions
 } from '../../utils/permissionAuth'
 
 import {isPlateSys} from '../../utils/common-util'
@@ -53,6 +46,8 @@ const user = {
   actions: {
     // 登录
     login({ commit }, userInfo) {
+      // 登录时先清除缓存的登录信息和权限信息
+      clearPermission()
       const username = userInfo.username.trim()
       return new Promise((resolve, reject) => {
         ssoService
@@ -140,6 +135,8 @@ const user = {
           })
         }
         if (loginName) {
+          // 登录时清除缓存的资源
+          removeAllSystemPermissions()
           // setToken(tokenInfo.jwt)
           // commit('setToken', tokenInfo.jwt)
           ssoService
@@ -198,20 +195,11 @@ const user = {
           .logout(state.token)
           .then((data) => {
             commit('setToken', '')
-            removeToken()
-            removeLanguage()
             removeTheme()
-            removeAllLanguages()
             removeAllThemes()
 
             commit('setName', '')
-            removeUsername()
-            removeCurrentUser()
-
-            removePermissions()
-  
-            removeMenus()
-            removePublishControl()
+            clearPermission()
             removeDevpPermissions()
             removeProjectSettings()
             removeProjectCode()
@@ -227,20 +215,11 @@ const user = {
     clearToken({ commit }) {
       return new Promise((resolve) => {
         commit('setToken', '')
-        removeToken()
-        removeLanguage()
         removeTheme()
-        removeAllLanguages()
         removeAllThemes()
 
         commit('setName', '')
-        removeUsername()
-        removeCurrentUser()
-
-        removePermissions()
-
-        removeMenus()
-        removePublishControl()
+        clearPermission()
         removeDevpPermissions()
         removeProjectSettings()
         removeProjectCode()
@@ -323,6 +302,21 @@ const user = {
       })
     },
 
+    // 判断当前用户密码是否过期
+    isPasswordExpiredWithValidateCode({ commit }, userInfo) {
+      const username = userInfo.username.trim()
+      return new Promise((resolve, reject) => {
+        ssoService
+          .isPasswordExpiredWithValidateCode(username, userInfo.password, userInfo.validCode, userInfo.imageCodeKey )
+          .then((message) => {
+            resolve(message)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    },
+
     updatePassword({ commit }, map) {
       return new Promise((resolve, reject) => {
         ssoService

package/src/utils/auth.js

@@ -1,4 +1,5 @@
 import authApi from './auth-api'
+import { removeAllSystemPermissions } from './permissionAuth'
 
 export function getToken() {
   return authApi.getToken()
@@ -68,7 +69,7 @@ export function setLanguage(language) {
   authApi.setLanguage(language)
 }
 
-export function removeLanguage() {
+function removeLanguage() {
   authApi.removeLanguage()
 }
 
@@ -80,7 +81,7 @@ export function setAllLanguages(langs) {
   authApi.setAllLanguages(langs)
 }
 
-export function removeAllLanguages() {
+function removeAllLanguages() {
   authApi.removeAllLanguages()
 }
 
@@ -113,7 +114,7 @@ export function removeAllThemes() {
   authApi.removeAllThemes()
 }
 
-export function removePublishControl() {
+function removePublishControl() {
   authApi.removePublishControl()
 }
 /**
@@ -140,4 +141,17 @@ export function removeProjectSettings() {
 
 export function removeProjectCode() {
   authApi.removeCookieCache('_PROJECT_CDOE')
+}
+
+// 清空token时需要清除的缓存信息
+export function clearPermission() {
+  removeToken()
+  removeLanguage()
+  removeAllLanguages()
+
+  removeUsername()
+  removeCurrentUser()
+
+  removeAllSystemPermissions()
+  removePublishControl()
 }