agilebuilder-ui 1.1.36-tmp4 → 1.1.37-sit1

package/packages/department-user-tree-inline/src/group-user/group-list.vue

@@ -1,99 +1,106 @@
 <template>
-		<div>
-				<el-dialog
-						model-value
-						:title="$t('departmentUserTreeInline.groupList')"
-						:close-on-click-modal="false"
-						append-to-body
-						width="30%"
-						@open="$emit('openDialog')"
-						@opend="$emit('opendDialog')"
-						@close="$emit('closeDialog')"
-						@closed="$emit('closedDialog')"
-				>
-						<div>
-								<div style="padding-bottom: 5px">
-										<el-button size="small" @click="addGroup()">
-												{{ $t('imatrixUIPublicModel.add') }}
-										</el-button>
-								</div>
-								<el-table :data="tableData" border style="width: 100%" max-height="350">
-										<el-table-column :label="$t('superGrid.index')" align="center" width="60">
-												<template #default="scope">
-														{{ scope.$index+1 }}
-												</template>
-										</el-table-column>
-										<el-table-column prop="name" :label="$t('departmentUserTreeInline.groupName')" />
-										<el-table-column :label="$t('imatrixUIPublicModel.edit')" align="center" width="130">
-												<template #default="scope">
-														<div>
-																<el-button type="primary" size="small" :icon="EditPen" circle @click="updateGroup(scope.$index, scope.row)" />
-																<el-button type="danger" size="small" :icon="Delete" circle @click="removeGroup(scope.$index, scope.row)" />
-														</div>
-												</template>
-										</el-table-column>
-								</el-table>
-						</div>
-				</el-dialog>
-				<GroupInput
-						v-if="isShowInput2"
-						:group-id="groupId"
-						@closeDialog="closeGroupInput"
-				/>
-		</div>
+  <div>
+    <el-dialog
+      model-value
+      :title="$t('departmentUserTreeInline.groupList')"
+      :close-on-click-modal="false"
+      append-to-body
+      width="30%"
+      @open="$emit('openDialog')"
+      @opend="$emit('opendDialog')"
+      @close="$emit('closeDialog')"
+      @closed="$emit('closedDialog')"
+    >
+      <div>
+        <div style="padding-bottom: 5px">
+          <el-button size="small" @click="addGroup()">
+            {{ $t('imatrixUIPublicModel.add') }}
+          </el-button>
+        </div>
+        <el-table :data="tableData" border style="width: 100%" max-height="350">
+          <el-table-column :label="$t('superGrid.index')" align="center" width="60">
+            <template #default="scope">
+              {{ scope.$index + 1 }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" :label="$t('departmentUserTreeInline.groupName')" />
+          <el-table-column :label="$t('imatrixUIPublicModel.edit')" align="center" width="130">
+            <template #default="scope">
+              <div>
+                <el-button
+                  type="primary"
+                  size="small"
+                  :icon="EditPen"
+                  circle
+                  @click="updateGroup(scope.$index, scope.row)"
+                />
+                <el-button
+                  type="danger"
+                  size="small"
+                  :icon="Delete"
+                  circle
+                  @click="removeGroup(scope.$index, scope.row)"
+                />
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
+    <GroupInput v-if="isShowInput2" :group-id="groupId" @closeDialog="closeGroupInput" />
+  </div>
 </template>
 <script setup>
-import {EditPen,Delete} from '@element-plus/icons-vue'
+import { EditPen, Delete } from '@element-plus/icons-vue'
 </script>
 <script>
-import GroupInput from './group-input'
+import GroupInput from './group-input.vue'
 import groupUserTreeSevice from '../group-user-tree-service'
 export default {
-		name: 'GroupList',
-		components: {
-				GroupInput,
-		},
-		props: {
-		},
-		data() {
-				return {
-						tableData: [],
-						isShowInput2: false,
-						groupId: null
-				}
-		},
-		created() {
-				this.listGroups()
-		},
-		methods: {
-				...groupUserTreeSevice,
-				listGroups() {
-						this.getUserGroupList().then((data) => {
-								this.tableData = data
-						})
-				},
-				updateGroup(rowindex, row) {
-						this.groupId = row.id
-						this.isShowInput2 = true
-				},
-				removeGroup(rowindex, row) {
-						this.deleteUserGroup(row.id).then(() => {
-								this.$message({
-										showClose: true,
-										type: 'success',
-										message: this.$t('superGrid.deleteSuccessful')
-								})
-								this.listGroups()
-						})
-				},
-				closeGroupInput() {
-						this.isShowInput2 = false
-						this.listGroups()
-				},
-				addGroup() {
-						this.groupId = null
-						this.isShowInput2 = true
-				}
-		}
+  name: 'GroupList',
+  components: {
+    GroupInput
+  },
+  props: {},
+  data() {
+    return {
+      tableData: [],
+      isShowInput2: false,
+      groupId: null
+    }
+  },
+  created() {
+    this.listGroups()
+  },
+  methods: {
+    ...groupUserTreeSevice,
+    listGroups() {
+      this.getUserGroupList().then((data) => {
+        this.tableData = data
+      })
+    },
+    updateGroup(rowindex, row) {
+      this.groupId = row.id
+      this.isShowInput2 = true
+    },
+    removeGroup(rowindex, row) {
+      this.deleteUserGroup(row.id).then(() => {
+        this.$message({
+          showClose: true,
+          type: 'success',
+          message: this.$t('superGrid.deleteSuccessful')
+        })
+        this.listGroups()
+      })
+    },
+    closeGroupInput() {
+      this.isShowInput2 = false
+      this.listGroups()
+    },
+    addGroup() {
+      this.groupId = null
+      this.isShowInput2 = true
+    }
+  }
 }
 </script>

package/packages/department-user-tree-inline/src/group-user/group-user.vue

@@ -1,42 +1,38 @@
 <template>
   <span style="padding-left: 10px">
-				<el-icon><CirclePlus @click="isShowList = true" /></el-icon>
-    <GroupList
-						v-if="isShowList"
-						@closeDialog="closeList()"
-				/>
+    <el-icon><CirclePlus @click="isShowList = true" /></el-icon>
+    <GroupList v-if="isShowList" @closeDialog="closeList()" />
   </span>
 </template>
 <script>
-import GroupList from './group-list'
+import GroupList from './group-list.vue'
 import groupUserTreeService from '../group-user-tree-service'
 import { CirclePlus } from '@element-plus/icons-vue'
 export default {
-		name: 'GroupUser',
-		components: {
-				GroupList,
-				CirclePlus
-		},
-		props: {
-				activeTab: {
-						type: String,
-						default: null
-				}
-		},
-		data() {
-				return {
-						isShowList: false,
-						groupId: null
-				}
-		},
-		created() {
-		},
-		methods: {
-				...groupUserTreeService,
-				closeList() {
-						this.isShowList = false
-						this.$emit('update-group-tree')
-				},
-		}
+  name: 'GroupUser',
+  components: {
+    GroupList,
+    CirclePlus
+  },
+  props: {
+    activeTab: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      isShowList: false,
+      groupId: null
+    }
+  },
+  created() {},
+  methods: {
+    ...groupUserTreeService,
+    closeList() {
+      this.isShowList = false
+      this.$emit('update-group-tree')
+    }
+  }
 }
 </script>

package/packages/department-user-tree-mobile/src/department-user-tree-app.vue

@@ -1,119 +1,147 @@
 <template>
-    <el-drawer v-model="isShowForm" append-to-body :close-on-click-modal="false" :close-on-press-escape="false" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
+  <el-drawer
+    v-model="isShowForm"
+    append-to-body
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    direction="btt"
+    size="100%"
+    class="organization-tree"
+    @close="closeTree()"
+  >
     <template #header>
-        <div style="text-align: center;">
-            {{$t('imatrixUIMessage.pleaseSelect')}}
-        </div>
+      <div style="text-align: center">
+        {{ $t('imatrixUIMessage.pleaseSelect') }}
+      </div>
     </template>
     <template #default>
-		<InlineDepartmentUserTreeApp v-if="isShowForm" :multiple="multiple" :departmentInfo="departmentInfo" :selectUserInfo="selectUserInfo" :searchField="searchField" :separator="separator" @close="closeTree"/>
+      <InlineDepartmentUserTreeApp
+        v-if="isShowForm"
+        :multiple="multiple"
+        :departmentInfo="departmentInfo"
+        :selectUserInfo="selectUserInfo"
+        :searchField="searchField"
+        :separator="separator"
+        :limitFilterColumn="limitFilterColumn"
+        @close="closeTree"
+      />
     </template>
   </el-drawer>
-
 </template>
-<script  lang="ts">
+<script lang="ts">
 export default {
   name: 'DepartmentUserTreeMobile'
 }
 </script>
-<script  setup lang="ts">
+<script setup lang="ts">
 import InlineDepartmentUserTreeApp from './department-user-tree-inline-app.vue'
-import { reactive,ref,onMounted, defineEmits } from 'vue'
+import { reactive, ref, onMounted, defineEmits } from 'vue'
 const props = defineProps<{
-		// 是否是多选树，默认是true
-		multiple: {
-			type: Boolean,
-			default: true,
-		},
-		// 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
-		departmentInfo: {
-			type: Array<any>,
-			default: null,
-		},
-		// 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
-		selectUserInfo: {
-			type: [String, Number],
-			default: null,
-		},
-		// 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
-		searchField: {
-			type: String,
-			default: 'loginName',
-		},
-		// 多选树时结果之间的分隔符，默认是逗号分隔
-		separator: {
-			type: String,
-			default: ','
-		}
-	}>()
-	const emits = defineEmits(['close'])
-	let isShowForm = ref(true)
-	// function showTree() {
-	// 	isShowForm.value = true
-	// }
-	function closeTree(selectNodeInfo) {
-		emits('close', selectNodeInfo)
-		isShowForm.value = false
-	}
-	function selectDepartment() {
-		// this.$refs.inlineDeparmentTree.selectDepartment()
-	}
-	// defineExpose({showTree})
+  // 是否是多选树，默认是true
+  multiple: {
+    type: Boolean
+    default: true
+  }
+  // 显示指定部门节点及其子节点，不传该属性，表示显示整个组织结构树
+  departmentInfo: {
+    type: Array<any>
+    default: null
+  }
+  // 多选用户树时，已选择用户id或登录名集合，多个之间以逗号隔开
+  selectUserInfo: {
+    type: [String, Number]
+    default: null
+  }
+  // 移除用户时，用户属性名称：id、loginName、email、telephone，默认是loginName
+  searchField: {
+    type: String
+    default: 'loginName'
+  }
+  // 多选树时结果之间的分隔符，默认是逗号分隔
+  separator: {
+    type: String
+    default: ','
+  }
+  // 根据变量限制部门时，根据部门表的哪个字段进行过滤，默认是code
+  limitFilterColumn: {
+    type: String
+    default: 'code'
+  }
+}>()
+const emits = defineEmits(['close'])
+let isShowForm = ref(true)
+// function showTree() {
+// 	isShowForm.value = true
+// }
+function closeTree(selectNodeInfo) {
+  emits('close', selectNodeInfo)
+  isShowForm.value = false
+}
+function selectDepartment() {
+  // this.$refs.inlineDeparmentTree.selectDepartment()
+}
+// defineExpose({showTree})
 </script>
 <style>
-.organization-tree, .organization-tree .el-checkbox__label,.organization-tree .el-breadcrumb__inner,.organization-tree .el-tree {
-	font-size: 17px;
-	font-weight: 700;
+.organization-tree,
+.organization-tree .el-checkbox__label,
+.organization-tree .el-breadcrumb__inner,
+.organization-tree .el-tree {
+  font-size: 17px;
+  font-weight: 700;
 }
 
-.organization-tree .el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner a, .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {
-    font-size: 17px;
-	font-weight: 700;
+.organization-tree .el-breadcrumb__item:last-child .el-breadcrumb__inner,
+.el-breadcrumb__item:last-child .el-breadcrumb__inner a,
+.el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover,
+.el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {
+  font-size: 17px;
+  font-weight: 700;
 }
 .organization-tree .el-card__body {
-	padding-top: 10px;
+  padding-top: 10px;
 }
 .organization-tree .card-content {
-	margin-top: 10px;
+  margin-top: 10px;
 }
 .organization-tree .item-row-all {
-	margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 .organization-tree .item-row {
-	display: flex;
-	width: 100%;
+  display: flex;
+  width: 100%;
 }
 .organization-tree .item-label {
-	flex: 0 0 90%;
-	text-align: left;
+  flex: 0 0 90%;
+  text-align: left;
 }
 .organization-tree .item-side {
-	flex: 0 0 10%;
-	text-align: right;
+  flex: 0 0 10%;
+  text-align: right;
 }
 .organization-tree .el-tree-node {
-	margin-bottom: 10px;
+  margin-bottom: 10px;
 }
 
-.organization-tree .el-tree-node__content>.el-tree-node__expand-icon {
-	padding: 0;
-	display: none;
+.organization-tree .el-tree-node__content > .el-tree-node__expand-icon {
+  padding: 0;
+  display: none;
 }
 
 .organization-tree .card-footer {
-	padding: 20px;
+  padding: 20px;
 }
 .organization-tree .card-footer .select-result {
-	color: #409EFF;
-	flex:1 1 75%;
-	text-align: left;
+  color: #409eff;
+  flex: 1 1 75%;
+  text-align: left;
 }
 .organization-tree .card-footer .button-area {
-	flex:0 0 20%;
-	text-align: right;
+  flex: 0 0 20%;
+  text-align: right;
 }
 
-.organization-tree .dept-path .breadcrumb-label-link{
-	color:#409EFF
+.organization-tree .dept-path .breadcrumb-label-link {
+  color: #409eff;
 }
 </style>