agilebuilder-ui 1.1.65-tmp22 → 1.1.65-tmp24

package/lib/utils/organization.cjs

@@ -1,43 +1,54 @@
 "use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" }), exports.addSelectedUserInfo = function(e, n, a) {
-  if (e.userIds.indexOf(n.id) < 0) {
-    e.userIds.push(n.id), e.loginNames.push(n.loginName), n.email && "" !== n.email && e.emails.push(n.email), n.telephone && "" !== n.telephone && e.telephones.push(n.telephone), n.user ? e.users.push(n.user) : e.users.push(n);
-    var t = n.name;
-    n.enName && "" !== n.enName && (t = t + "(" + n.enName + ")"), e.userNames.push(t), e.userZhNames.push(n.name), e.userEnNames.push(n.enName ? n.enName : "");
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" }), exports.addSelectedUserInfo = function(e, a, n) {
+  if (e.userIds.indexOf(a.id) < 0) {
+    e.userIds.push(a.id), e.loginNames.push(a.loginName), a.email && "" !== a.email && e.emails.push(a.email), a.telephone && "" !== a.telephone && e.telephones.push(a.telephone), a.user ? e.users.push(a.user) : e.users.push(a);
+    var t = a.name;
+    a.enName && "" !== a.enName && (t = t + "(" + a.enName + ")"), e.userNames.push(t), e.userZhNames.push(a.name), e.userEnNames.push(a.enName ? a.enName : "");
   }
 }, exports.getDeptNamePath = function(e) {
-  let n = "";
+  let a = "";
   if (e && e.data) {
-    n = JSON.parse(e.data).namePath;
+    a = JSON.parse(e.data).namePath;
+  }
+  return a;
+}, exports.getShowDeptNamePath = function(e, a) {
+  let n = "";
+  if (a.namePath)
+    return e === a.namePath ? "" : a.namePath;
+  if (a && a.data) {
+    const t = JSON.parse(a.data);
+    if (e === t.namePath)
+      return "";
+    n = t.namePath;
   }
   return n;
 }, exports.getUserMainDeptName = function(e) {
-  let n = "";
+  let a = "";
   if (e && e.data) {
-    const a = JSON.parse(e.data);
-    a.mainDepartmentEnName && "" !== a.mainDepartmentEnName && window.$locale && "cn" !== window.$locale ? n = a.mainDepartmentEnName : a.mainDepartmentName && "" !== a.mainDepartmentName && (n = a.mainDepartmentName);
+    const n = JSON.parse(e.data);
+    n.mainDepartmentEnName && "" !== n.mainDepartmentEnName && window.$locale && "cn" !== window.$locale ? a = n.mainDepartmentEnName : n.mainDepartmentName && "" !== n.mainDepartmentName && (a = n.mainDepartmentName);
   }
-  return n;
-}, exports.initSelectUsers = function(e, n, a) {
-  return new Promise((t, i) => {
-    const r = [];
-    n ? "所有用户" === n ? (r.push({ id: -1, name: "所有用户" }), t(r)) : "所有工作组人员" === n ? (r.push({ id: -1, name: "所有工作组人员" }), t(r)) : function(e2, n2, a2) {
-      return new Promise((t2, i2) => {
-        e2 && n2 ? window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + "/component/organization-trees/select-users-mobile?searchField=" + e2 + "&selectUserInfo=" + n2 + "&separator=" + a2).then((e3) => {
+  return a;
+}, exports.initSelectUsers = function(e, a, n) {
+  return new Promise((t, r) => {
+    const i = [];
+    a ? "所有用户" === a ? (i.push({ id: -1, name: "所有用户" }), t(i)) : "所有工作组人员" === a ? (i.push({ id: -1, name: "所有工作组人员" }), t(i)) : function(e2, a2, n2) {
+      return new Promise((t2, r2) => {
+        e2 && a2 ? window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + "/component/organization-trees/select-users-mobile?searchField=" + e2 + "&selectUserInfo=" + a2 + "&separator=" + n2).then((e3) => {
           t2(e3);
         }).catch((e3) => {
-          i2(e3);
+          r2(e3);
         }) : t2([]);
       });
-    }(e, n, a).then((e2) => {
+    }(e, a, n).then((e2) => {
       t(e2);
     }).catch((e2) => {
-      i(e2);
-    }) : t(r);
+      r(e2);
+    }) : t(i);
   });
-}, exports.packageSelectResult = function(e, n) {
-  let a = e.name;
-  return e.enName && "" !== e.enName.trim() && (a = a + "(" + e.enName + ")"), { id: e.id, name: a, zhName: e.name, loginName: e.loginName, email: e.email, telephone: e.telephone, containBranch: n, user: e, enName: e.enName ? e.enName : "", subCompanyName: e.subCompanyName, divisionManager: e.divisionManager, divisionManagerName: e.divisionManagerName };
+}, exports.packageSelectResult = function(e, a) {
+  let n = e.name;
+  return e.enName && "" !== e.enName.trim() && (n = n + "(" + e.enName + ")"), { id: e.id, name: n, zhName: e.name, loginName: e.loginName, email: e.email, telephone: e.telephone, containBranch: a, user: e, enName: e.enName ? e.enName : "", subCompanyName: e.subCompanyName, divisionManager: e.divisionManager, divisionManagerName: e.divisionManagerName };
 }, exports.resizeScrollTargetHeightUtil = function() {
   let e = window.innerHeight - 16;
   return document.querySelector(".el-page-header") && (e -= 50), document.querySelector(".mobile-tab") && (e -= 56), e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.65-tmp22",
+  "version": "1.1.65-tmp24",
   "type": "module",
   "private": false,
   "main": "./lib/index.cjs",

package/src/components/Card/index.jsx

@@ -1,7 +1,7 @@
 /** @jsxImportSource vue */
-import { defineComponent, ref, computed, watch, onMounted } from 'vue'
+import { defineComponent, ref, computed, watch, onMounted, defineEmits } from 'vue'
 import { ElCard, ElTag, ElButton, ElIcon, ElCheckbox } from 'element-plus'
-import { Bottom, Tickets } from '@element-plus/icons-vue'
+import { Bottom, Tickets,Edit } from '@element-plus/icons-vue'
 import Scrollbar from '../Scrollbar'
 // import { $emit, $off, $on } from '@/utils/gogocodeTransfer'
 import { useI18n } from 'vue-i18n'
@@ -54,10 +54,16 @@ export default defineComponent({
     setHeight: {
       type: [Function, undefined],
       default: () => undefined
+    },
+    // 列表是否启用行编辑
+    isEnableEdit: {
+        type: Boolean,
+        default: () => false
     }
   },
   setup(props, { attrs, emit, slots }) {
     console.log('*card-view.jsx**********************************************=>', props, attrs, slots)
+    defineEmits(['checked', 'showSubTable', 'rowDblclick', 'rowClick']);
     const isMore = ref(props.isShowDetailsMore)
     const { t } = useI18n()
     const scrollHeight = ref(undefined)
@@ -146,6 +152,10 @@ export default defineComponent({
               </div>
               <div class="yx-flex-wrap" align="center" style={{ gap: '10px' }}>
                 {getSlotHtml(slots.headerRightSlot)}
+                { props.isEnableEdit && <ElButton text icon={<ElIcon><Edit /></ElIcon>} onClick={event => {
+                    event.stopPropagation()
+                    emit('rowDblclick', event)
+                }} />}
                 {props.isSubTable && (
                   <ElButton
                     text

package/src/components/Scrollbar/index.vue

@@ -1,213 +1,224 @@
 <template>
-    <el-scrollbar v-bind="mergedAttrs" :class="{ 'is-dispatch': props.dispatch }" ref="scrollbarRef">
-        <slot />
-    </el-scrollbar>
+  <el-scrollbar v-bind="mergedAttrs" :class="{ 'is-dispatch': props.dispatch }" ref="scrollbarRef">
+    <slot />
+  </el-scrollbar>
 </template>
 
 <script setup>
-import { ElScrollbar } from 'element-plus';
+import { ElScrollbar } from 'element-plus'
 // import { useStore } from 'vuex';
-import store from '../../store';
-import { toRefs, reactive, mergeProps, ref, onMounted, watch, useAttrs, computed, defineEmits, useSlots } from 'vue';
+import store from '../../store'
+import { toRefs, reactive, mergeProps, ref, onMounted, watch, useAttrs, computed, defineEmits, useSlots } from 'vue'
 
-const slots = useSlots();
+const slots = useSlots()
 
 // const store = useStore();
 
-store?.dispatch?.('startListeningToResize');
+store?.dispatch?.('startListeningToResize')
 
-const scrollbarRef = ref(null);
+const scrollbarRef = ref(null)
 
 const scrollToEmitValue = ref(undefined)
 
-const emits = defineEmits(['scrollToTop', 'scrollToBottom']);
+const emits = defineEmits(['scrollToTop', 'scrollToBottom'])
 
 const resizeProps = computed(() => ({
-    // 宽度
-    windowWidth: store.getters.windowWidth,
-    // 高度
-    windowHeight: store.getters.windowHeight,
-    // 是否移动端
-    isMobileResize: store.getters.isMobileResize,
-}));
+  // 宽度
+  windowWidth: store.getters.windowWidth,
+  // 高度
+  windowHeight: store.getters.windowHeight,
+  // 是否移动端
+  isMobileResize: store.getters.isMobileResize
+}))
 
 // 定义初始化参数
 const defaultAttrs = reactive({
-    always: false, // 滚动条是否总是显示
-    // wrapStyle: 'height: 100%', // 滚动区域的样式
-});
+  always: false // 滚动条是否总是显示
+  // wrapStyle: 'height: 100%', // 滚动区域的样式
+})
 
 const props = defineProps({
-    // 是否开启滚动距离阴影
-    showScrollShadow: {
-        type: Boolean,
-        default: true
-    },
-    triggerDistance: {
-        type: Number,
-        default: 0
-    },
-    // 是否禁止滚动
-    dispatch: {
-        type: Boolean,
-        default: false
-    },
-    // 动态计算 max-height
-    setMaxHeight: {
-        type: [Function, undefined],
-        default: () => undefined
-    },
-    // 动态计算 height
-    setHeight: {
-        type: [Function, undefined],
-        default: () => undefined
-    }
-});
+  // 是否开启滚动距离阴影
+  showScrollShadow: {
+    type: Boolean,
+    default: true
+  },
+  triggerDistance: {
+    type: Number,
+    default: 0
+  },
+  // 是否禁止滚动
+  dispatch: {
+    type: Boolean,
+    default: false
+  },
+  // 动态计算 max-height
+  setMaxHeight: {
+    type: [Function, undefined],
+    default: () => undefined
+  },
+  // 动态计算 height
+  setHeight: {
+    type: [Function, undefined],
+    default: () => undefined
+  }
+})
 
-const { attrs } = useAttrs();
+const { attrs } = useAttrs()
 
 // 统一写入
 const setHeightFun = (fun) => {
-    try {
-        return fun?.(resizeProps.value)
-    } catch (error) {
-        console.error(error)
-    }
-    return
+  try {
+    return fun?.(resizeProps.value)
+  } catch (error) {
+    console.error(error)
+  }
+  return
 }
 
 // 合并初始化参数和传入的属性
 const mergedAttrs = computed(() => {
-    const attrsData = mergeProps(defaultAttrs, attrs)
-    return {
-        ...({
-            // 绑定 setMaxHeight 事件 返回 最大高度
-            ...(props.setMaxHeight ? { maxHeight: setHeightFun(props.setMaxHeight) } : {}),
-            // 绑定 setHeight 事件 返回 高度
-            ...(props.setHeight ? { height: setHeightFun(props.setHeight) } : {}),
-        }),
-        ...attrsData
-    }
-});
+  const attrsData = mergeProps(defaultAttrs, attrs)
+  return {
+    ...{
+      // 绑定 setMaxHeight 事件 返回 最大高度
+      ...(props.setMaxHeight ? { maxHeight: setHeightFun(props.setMaxHeight) } : {}),
+      // 绑定 setHeight 事件 返回 高度
+      ...(props.setHeight ? { height: setHeightFun(props.setHeight) } : {})
+    },
+    ...attrsData
+  }
+})
 
 // 滚动距离回调事件
 const scrollToEmits = (scrollElement) => {
-    if (!scrollElement) return
-    const isAtTop = scrollElement.scrollTop <= props.triggerDistance;
-    const isAtBottom = scrollElement.scrollTop + scrollElement.clientHeight >= (scrollElement.scrollHeight - props.triggerDistance);
-    if (isAtBottom) {
-        // scrollToEmitValue 校验确保只执行一次
-        // 底部事件 
-        !['at-bottom'].includes(scrollToEmitValue.value) && emits('scrollToBottom');
-        scrollToEmitValue.value = 'at-bottom'
-    } else if (isAtTop) {
-        // 顶部事件
-        !['at-top'].includes(scrollToEmitValue.value) && emits('scrollToTop');
-        scrollToEmitValue.value = 'at-top'
-    } else {
-        scrollToEmitValue.value = undefined
-    }
+  if (!scrollElement) return
+  const isAtTop = scrollElement.scrollTop <= props.triggerDistance
+  // +1 解决精度问题
+  const isAtBottom =
+    scrollElement.scrollTop + scrollElement.clientHeight + 1 >= scrollElement.scrollHeight - props.triggerDistance
+  if (isAtBottom) {
+    // scrollToEmitValue 校验确保只执行一次
+    // 底部事件
+    !['at-bottom'].includes(scrollToEmitValue.value) && emits('scrollToBottom')
+    scrollToEmitValue.value = 'at-bottom'
+  } else if (isAtTop) {
+    // 顶部事件
+    !['at-top'].includes(scrollToEmitValue.value) && emits('scrollToTop')
+    scrollToEmitValue.value = 'at-top'
+  } else {
+    scrollToEmitValue.value = undefined
+  }
 }
 
 // 滚动阴影事件
 const handleScroll = () => {
-    const scrollElement = scrollbarRef.value?.$el.querySelector('.el-scrollbar__wrap');
-    if (scrollElement) {
-        const isAtTop = scrollElement.scrollTop === 0;
-        const isAtBottom = scrollElement.scrollTop + scrollElement.clientHeight === scrollElement.scrollHeight;
-        if (props.showScrollShadow) {
-            if (!isAtTop) {
-                scrollbarRef.value.$el.classList.add('scroll-top-shadow');
-            } else {
-                scrollbarRef.value.$el.classList.remove('scroll-top-shadow');
-            }
-            if (!isAtBottom) {
-                scrollbarRef.value.$el.classList.add('scroll-bottom-shadow');
-            } else {
-                scrollbarRef.value.$el.classList.remove('scroll-bottom-shadow');
-            }
-        } else {
-            scrollbarRef.value.$el.classList.remove('scroll-top-shadow', 'scroll-bottom-shadow');
-        }
-        scrollToEmits(scrollElement);
+  const scrollElement = scrollbarRef.value?.$el.querySelector('.el-scrollbar__wrap')
+  if (scrollElement) {
+    const isAtTop = scrollElement.scrollTop === 0
+    const isAtBottom = scrollElement.scrollTop + scrollElement.clientHeight === scrollElement.scrollHeight
+    if (props.showScrollShadow) {
+      if (!isAtTop) {
+        scrollbarRef.value.$el.classList.add('scroll-top-shadow')
+      } else {
+        scrollbarRef.value.$el.classList.remove('scroll-top-shadow')
+      }
+      if (!isAtBottom) {
+        scrollbarRef.value.$el.classList.add('scroll-bottom-shadow')
+      } else {
+        scrollbarRef.value.$el.classList.remove('scroll-bottom-shadow')
+      }
+    } else {
+      scrollbarRef.value.$el.classList.remove('scroll-top-shadow', 'scroll-bottom-shadow')
     }
-};
+    scrollToEmits(scrollElement)
+  }
+}
 
 onMounted(() => {
-    const scrollElement = scrollbarRef.value.$el.querySelector('.el-scrollbar__wrap');
-    if (scrollElement) {
-        scrollElement.addEventListener('scroll', handleScroll);
-        handleScroll();
-        scrollToEmits(scrollElement);
-    }
-});
+  const scrollElement = scrollbarRef.value.$el.querySelector('.el-scrollbar__wrap')
+  if (scrollElement) {
+    scrollElement.addEventListener('scroll', handleScroll)
+    handleScroll()
+    scrollToEmits(scrollElement)
+  }
+})
 
-watch(() => props.showScrollShadow, () => {
-    handleScroll();
-});
+watch(
+  () => props.showScrollShadow,
+  () => {
+    handleScroll()
+  }
+)
 
-watch(() => mergedAttrs?.maxHeight, () => {
-    setTimeout(handleScroll, 500);
-});
+watch(
+  () => mergedAttrs?.maxHeight,
+  () => {
+    setTimeout(handleScroll, 500)
+  }
+)
 
-watch(() => mergedAttrs?.height, () => {
-    setTimeout(handleScroll, 500);
-});
+watch(
+  () => mergedAttrs?.height,
+  () => {
+    setTimeout(handleScroll, 500)
+  }
+)
 watch(
   () => slots.default?.(),
   (newValue, oldValue) => {
     if (newValue !== oldValue) {
-        setTimeout(handleScroll, 500);
+      setTimeout(handleScroll, 500)
     }
   },
   { deep: true }
-);
+)
 </script>
 
 <style lang="scss" scoped>
 .el-scrollbar ::v-deep {
-    position: relative;
+  position: relative;
 
-    &.is-dispatch {
-        & > .el-scrollbar__wrap {
-            max-height: none !important;
-            overflow: initial !important;
+  &.is-dispatch {
+    & > .el-scrollbar__wrap {
+      max-height: none !important;
+      overflow: initial !important;
 
-            & ~ el-scrollbar__bar {
-                display: none;
-            }
-        }
+      & ~ el-scrollbar__bar {
+        display: none;
+      }
     }
-
-    &.scroll-top-shadow {
-        &::before {
-            content: ' ';
-            position: absolute;
-            top: 0;
-            left: 0;
-            right: 0;
-            height: 8px;
-            box-shadow: inset 0 8px 8px -8px rgba(0, 0, 0, 0.2);
-            z-index: 2;
-        }
+  }
+
+  &.scroll-top-shadow {
+    &::before {
+      content: ' ';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      height: 8px;
+      box-shadow: inset 0 8px 8px -8px rgba(0, 0, 0, 0.2);
+      z-index: 2;
     }
-
-    &.scroll-bottom-shadow {
-        &::after {
-            content: ' ';
-            position: absolute;
-            bottom: 0;
-            left: 0;
-            right: 0;
-            height: 8px;
-            box-shadow: inset 0 -8px 8px -8px rgba(0, 0, 0, 0.2);
-            z-index: 2;
-        }
+  }
+
+  &.scroll-bottom-shadow {
+    &::after {
+      content: ' ';
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      height: 8px;
+      box-shadow: inset 0 -8px 8px -8px rgba(0, 0, 0, 0.2);
+      z-index: 2;
     }
+  }
 
-    &>.el-scrollbar__wrap {
-        position: relative;
-        z-index: 1;
-    }
+  & > .el-scrollbar__wrap {
+    position: relative;
+    z-index: 1;
+  }
 }
-</style>
+</style>

package/src/i18n/langs/cn.js

@@ -49,7 +49,9 @@ const cn = {
     emptyValue: '空值',
     expand: '展开',
     collapse: '收起',
-    confirmClosePage: '确认关闭此页面吗？未保存的数据将会丢失。'
+    noData: '暂无数据',
+    confirmClosePage: '确认关闭此页面吗？未保存的数据将会丢失。',
+    noMoreData: '没有更多数据了'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: '是否确认删除',
@@ -146,7 +148,13 @@ const cn = {
     searchEmpty: '查询空值',
     canntAddTip: '不满足新建操作条件，不能执行新建操作，请检查！',
     rowCanntDeleteTip: '不满足删除操作条件，不能执行删除操作，请检查！',
-    rowCanntEditTip: '不满足编辑操作条件，不能执行编辑操作，请检查！'
+    rowCanntEditTip: '不满足编辑操作条件，不能执行编辑操作，请检查！',
+    searchCondition: '查询条件',
+    orderField: '排序字段',
+    orderType: '排序方式',
+    orderTypeAsc: '升序',
+    orderTypeDesc: '降序',
+    close: '关闭'
   },
   // 部门树组件
   departmentTree: {},

package/src/i18n/langs/en.js

@@ -49,7 +49,9 @@ const en = {
     emptyValue: 'Empty Value',
     expand: 'Expand',
     collapse: 'Collapse',
-    confirmClosePage: 'Are you sure you want to close this page? Unsaved data will be lost.'
+    noData: 'No Data',
+    confirmClosePage: 'Are you sure you want to close this page? Unsaved data will be lost.',
+    noMoreData: 'No more data'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: 'Whether To Confirm Deletion',
@@ -147,7 +149,13 @@ const en = {
     canntAddTip: 'Does not meet the new operation conditions, cannot perform the new operation, please check!',
     rowCanntDeleteTip:
       'Does not meet the delete operation conditions, cannot perform the delete operation, please check!',
-    rowCanntEditTip: 'Does not meet the edit operation conditions, cannot perform the edit operation, please check!'
+    rowCanntEditTip: 'Does not meet the edit operation conditions, cannot perform the edit operation, please check!',
+    searchCondition: 'Search Conditon',
+    orderField: 'Order Field',
+    orderType: 'Order Type',
+    orderTypeAsc: 'Asc',
+    orderTypeDesc: 'Desc',
+    close: 'Close'
   },
   departmentTree: {},
   departmentTreeInline: {

package/src/styles/index.scss

@@ -36,11 +36,18 @@ body {
 .el-select .el-select__tags-text,
 .el-select .el-select__selected-item,
 .el-table .cell,
-.el-input__inner,
-.el-textarea__inner {
+.el-input__inner {
   white-space: pre !important;
 }
 
+// textarea 自动换行样式，否则会被white-space: nowrap覆盖
+.el-textarea__inner {
+  white-space: pre-wrap !important;
+  word-wrap: break-word !important;
+  word-break: break-all;
+  overflow-wrap: break-word;
+}
+
 html,
 body {
   margin: 0;

package/src/styles/theme/default.scss

@@ -2,30 +2,35 @@
 
 // :not(:has( > .three-column-layout, > .el-container))
 .app-container {
-    padding: var(--app-container-padding, 15px);
-    border-radius: 6px;
-    box-shadow: 0px 1px 8px 0px #00000019;
-    background-color: #fff;
+  padding: var(--app-container-padding, 15px);
+  border-radius: 6px;
+  box-shadow: 0px 1px 8px 0px #00000019;
+  background-color: #fff;
 }
 
 .flex-gap-15 {
-    display: flex;
-    gap: var(--layout-form-flex-gap, 15px);
-    align-items: center;
+  display: flex;
+  gap: var(--layout-form-flex-gap, 15px);
+  align-items: center;
 
-    & .el-button {
-        margin: 0;
+  & .el-button {
+    margin: 0;
 
-        &+.el-button {
-            margin: 0;
-        }
+    &+.el-button {
+      margin: 0;
     }
+  }
 }
 
 .operation-area {
   margin-bottom: 20px;
 }
 
+.operation-area--right {
+  display: flex;
+  justify-content: flex-end;
+}
+
 .operation-area-chart {
   padding-right: 24px;
   padding-top: 24px;
@@ -37,4 +42,4 @@
   position: fixed;
   bottom: 0;
   right: 4%;
-}
+}