imatrix-ui 2.9.44-dw → 2.9.46-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.44-dw",
+  "version": "2.9.46-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

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

@@ -3,9 +3,9 @@
     <el-table
       ref="superGrid"
       :data="gridData"
-      row-key="id"
       :row-class-name="tableRowClassName"
       :max-height="myHeight"
+      row-key="id"
       border
       fit
       @row-click="rowClick"
@@ -18,36 +18,49 @@
           </el-radio>
         </template>
       </el-table-column>
-      <el-table-column v-if="multiple && isSearchResult" fixed :label="$t('imatrixUIPublicModel.edit')" align="center" width="60px">
+      <el-table-column v-if="multiple && isSearchResult" :label="$t('imatrixUIPublicModel.edit')" fixed align="center" width="60px">
         <template slot-scope="scope">
           <div>
-            <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="isDisable(scope.row)" circle @click="addUser(scope.$index, scope.row)" />
+            <el-button :disabled="isDisable(scope.row)" type="primary" size="mini" icon="el-icon-plus" circle @click="addUser(scope.$index, scope.row)" />
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="multiple && !isSearchResult" fixed :label="$t('imatrixUIPublicModel.edit')" align="center" width="60px">
+      <el-table-column v-if="multiple && !isSearchResult" :label="$t('imatrixUIPublicModel.edit')" fixed align="center" width="60px">
         <template slot-scope="scope">
           <div>
             <el-button type="danger" size="mini" icon="el-icon-delete" circle @click="removeUser(scope.$index, scope.row)" />
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-if="multiple" :label="$t('superGrid.index')" align="center" width="60px">
+      <!-- <el-table-column v-if="multiple" :label="$t('superGrid.index')" align="center" width="60px">
         <template slot-scope="scope">
           {{ scope.$index+1 }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
-        :label="$t('departmentUserTreeInline.name')"
-        :width="130"
+        :label="$t('departmentUserTreeInline.user')"
         prop="name"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.enName && scope.row.enName.trim() !== ''" class="ellipsis cell--span" :title="scope.row.name+'('+scope.row.enName+')'">{{ scope.row.name+'('+scope.row.enName+')' }}</span>
-          <span v-else class="ellipsis cell--span" :title="scope.row.name">{{ 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"
@@ -64,7 +77,7 @@
         <template slot-scope="scope">
           <span class="ellipsis cell--span" :title="language && language !== 'cn' && scope.row.mainDepartmentEnName ? scope.row.mainDepartmentEnName : scope.row.mainDepartmentName">{{ language && language !== 'cn' && scope.row.mainDepartmentEnName ? scope.row.mainDepartmentEnName : scope.row.mainDepartmentName }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!--由于保密要求，邮箱不能显示，需要脱敏处理，暂时注释掉，不显示-->
       <!-- <el-table-column
         :label="$t('departmentUserTreeInline.email')"
@@ -75,7 +88,7 @@
           <span class="ellipsis cell--span" :title="scope.row.email">{{ scope.row.email }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
         v-if="containBranch"
         :label="$t('departmentUserTreeInline.branch')"
         :width="130"
@@ -84,7 +97,7 @@
         <template slot-scope="scope">
           <span class="ellipsis cell--span" :title="scope.row.subCompanyName">{{ scope.row.subCompanyName }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
   </div>
 </template>
@@ -151,6 +164,19 @@ export default {
     //   this.selectedUser = row
     //   // this.$emit('rowClick', row, column, event)
     // },
+    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
+    },
     // 移除用户
     removeUser(index, row) {
       this.$emit('removeUser', index, row)

package/packages/super-grid/src/formValidatorUtil.js

@@ -143,7 +143,7 @@ function validatorEntity(entity, listCode, $index, rules, isShouldRepeateValdate
   if (!listCode) {
     listCode = store.get('_list_code')
   }
-
+  console.log('superGird--validatorEntity---entity=', entity)
   const gridParams = store.get(listCode)
   validator.validate(entity, {
     first: true

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

@@ -110,6 +110,7 @@
             :grid-data="gridData"
             :page-grid-data="pageGridData"
             :current-page="currentPage"
+            @prohibitToEdit="prohibitToEdit"
           /></span>
         <span v-else-if="columnFormatter !== undefined && columnFormatter.type !== undefined && columnFormatter.type === 'secretInfo'" :id="column.prop+'DomData'+scope.$index" class="cell--span">
           <secret-info
@@ -462,7 +463,8 @@ export default {
         if (!isDynamic) {
           // 选项组保存时将数组处理为字符串
           const beforeColumnValue = param.row[this.column.prop]
-          if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
+          console.log('un-edit---beforeColumnValue=', beforeColumnValue, 'this.column.prop=', this.column.prop)
+          if (beforeColumnValue && Array.isArray(beforeColumnValue)) {
             // 如果是数组才需要转换
             this.$set(param.row, this.column.prop, beforeColumnValue.join(','))
           }
@@ -508,7 +510,7 @@ export default {
             }
           } else {
             const beforeColumnValue = param.row[this.column.prop]
-            if (beforeColumnValue && Object.prototype.toString.apply(beforeColumnValue) === '[object Array]') {
+            if (beforeColumnValue && Array.isArray(beforeColumnValue)) {
               // 如果是数组才需要转换
               this.$set(param.row, this.column.prop, beforeColumnValue.join(','))
             }

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

@@ -2894,6 +2894,9 @@ export default {
     // 设置字段禁止编辑
     fnProhibitToEdit(entity) {
       if (entity) {
+        if (entity.isForceUpdate) {
+          this.$emit('prohibitToEdit', entity)
+        }
         for (const key in entity) {
           // console.log('key', key)
           // console.log('this.$refs[key]', this.$refs)

package/src/i18n/langs/cn.js

@@ -151,7 +151,8 @@ const cn = {
     branch: '所属分支',
     removeUser: '移除用户',
     email: '邮箱',
-    loginName: '登录名'
+    loginName: '登录名',
+    user: '用户'
   },
   // 工作组树
   workgroupTree: {

package/src/i18n/langs/en.js

@@ -148,7 +148,8 @@ const en = {
     branch: 'Branch',
     removeUser: 'Remove User',
     email: 'Email',
-    loginName: 'Login Name'
+    loginName: 'Login Name',
+    user: 'User'
   },
   // 工作组树
   workgroupTree: {