resolver-egretimp-plus 0.1.93 → 0.1.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.93",
+  "version": "0.1.95",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/components/packages-H5/CustomComponentTableH5.vue

@@ -303,26 +303,28 @@ function normalTableRowValue(row) {
 }
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
-    <cmi-table-column
-      v-for="column in pmPageMetaList" :key="column.metaCode"
-      v-bind="{
-        ...attrs,
-        ...getTableColumnProps(column)
-      }"
-    >
-    </cmi-table-column>
-  </cmi-table>
-  <div v-if="pageable && normalPageTotal > 3" :style="{'display': 'flex', 'justify-content': pageAlignEnmu[pageAlign || PAGE_CENTER]}" style="margin-bottom: 12px;">
-    <cmi-pagination
-      :key="normalPageTotal"
-      style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
-      v-bind="{...paginationProps, ...pagenationEvents}"
-      @sizeChange="pagenationEvents.onSizeChange"
-      @currentChange="pagenationEvents.onCurrentChange"
-      :total="normalPageTotal"
-      :pagesize="page.pageSize"
-      :current="page.pageNum"
-    />
+  <div>
+    <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
+      <cmi-table-column
+        v-for="column in pmPageMetaList" :key="column.metaCode"
+        v-bind="{
+          ...attrs,
+          ...getTableColumnProps(column)
+        }"
+      >
+      </cmi-table-column>
+    </cmi-table>
+    <div v-if="pageable && normalPageTotal > 3" :style="{'display': 'flex', 'justify-content': pageAlignEnmu[pageAlign || PAGE_CENTER]}" style="margin-bottom: 12px;">
+      <cmi-pagination
+        :key="normalPageTotal"
+        style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
+        v-bind="{...paginationProps, ...pagenationEvents}"
+        @sizeChange="pagenationEvents.onSizeChange"
+        @currentChange="pagenationEvents.onCurrentChange"
+        :total="normalPageTotal"
+        :pagesize="page.pageSize"
+        :current="page.pageNum"
+      />
+    </div>
   </div>
 </template>

package/src/components/packages-web/CustomComponentSelectEmployees.vue

@@ -12,7 +12,7 @@
 <script setup>
 import { onMounted, inject, watch, defineProps, computed, defineEmits, nextTick, resolveComponent } from 'vue';
 import { useSelEmployeeJs } from '../helper/dock.js'
-import { commonPropsType, debounce } from '../../utils/index.js'
+import { commonPropsType, debounce, isBoolean, isString } from '../../utils/index.js'
 import { useFormItem } from 'element-plus'
 
 // const SearchIcon = resolveComponent('Search')
@@ -25,6 +25,20 @@ const props = defineProps({
     type: [String, Boolean],
     default: false
   },
+  // ====start==== 按部门查找人员，type为user时有效，结构为{deptIds:'xxx,yyy', cascade: true, excludeDeptIds:'xxx,yyy'}, deptIds为部门ID（如有多个用英文逗号分隔），cascade为是否包含下级部门人员, excludeDeptIds为除外部门ID（如有多个用英文逗号分隔）
+  cascade: {
+    type: Boolean,
+    default: true
+  },
+  deptIds: {
+    type: String,
+    default: ''
+  },
+  excludeDeptIds: {
+    type: String,
+    default: ''
+  },
+  // ====end==== 按部门查找人员，type为user时有效，结构为{deptIds:'xxx,yyy', cascade: true, excludeDeptIds:'xxx,yyy'}, deptIds为部门ID（如有多个用英文逗号分隔），cascade为是否包含下级部门人员, excludeDeptIds为除外部门ID（如有多个用英文逗号分隔）
   type: {
     type: String,
     default: 'user'
@@ -88,15 +102,18 @@ const initSelEmployee = async () => {
     await seelp(200)
     console.log('select-employees modelValue:', modelValue.value)
     const data = modelValue.value ? modelValue.value.split(separator.value) : []
+    let deptForUser = {}
+    if (props.deptIds || props.excludeDeptIds) {
+      deptForUser.deptIds = isString(deptForUser.deptIds) ? props.deptIds : ''
+      deptForUser.excludeDeptIds = isString(deptForUser.excludeDeptIds) ? props.excludeDeptIds : ''
+      deptForUser.cascade = isBoolean(deptForUser.cascade) ? deptForUser.cascade : !!(deptForUser.cascade)
+    }
     const initParams = {
       el: `#${metaCode.value}`,
       data,
       token: feiShuTokens,
       type: props.type,
-      deptForUser: {
-        // deptIds: '100178100000000001X8',
-        // cascade: true
-      },
+      deptForUser,
       lang: lang.value,
       multiple: typeof props.multiple === 'boolean' ? props.multiple : props.multiple == '1',
       placeholder: lang?.value?.indexOf('zh') > -1 ? props.placeholder : props.placeholderEn,

package/src/rulesImp/events.js

@@ -28,6 +28,8 @@ import {
 import { ARG_FLAGS, MULTI_PAGE_META_LIST_TYPES } from '../utils/const'
 
 import { findComponent, formatDate, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
+import dayjs from 'dayjs';
+
 const valArrTypes = [...MULTI_PAGE_META_LIST_TYPES]
 const valBooleanTypes = []
 
@@ -538,6 +540,9 @@ const allInitEvents = {
             if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE) {
               return formatDate(new Date(), 'yyyy-MM-dd')
             }
+            if (matchVal.trimEnd().trimStart() === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+              return dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
+            }
             return originVal
           })
         } else {

package/src/utils/const.js

@@ -7,6 +7,7 @@ export const MODE = {
 }
 export const ARG_FLAGS = {
   CURRENT_DATE: '_currentDate',
+  CURRENT_DATE_EXCLUDE: '_currentDateExclude',
   CURRENT_DATE_TIME: '_currentDateTime',
   REF_VAL: '_refVal'
 }

package/src/utils/defaultVal.js

@@ -2,6 +2,7 @@ import { toRaw } from 'vue'
 import { formatDate, isPlainObject } from './common'
 import { ARG_FLAGS, isHidden, VALUE_TYPES } from './const'
 import { isArray, isNumber, isString } from './is'
+import dayjs from 'dayjs'
 
 export default function defaultVal(config) {
   if (
@@ -27,9 +28,17 @@ export default function defaultVal(config) {
         } else if (/^{[\w\W]*}$/.test(trimValue) || /^\[[\w\W]*\]$/.test(trimValue)) {
           defaultVal = JSON.parse(trimValue)
         } else {
-          if (trimValue === ARG_FLAGS.CURRENT_DATE || trimValue === 'currentDate' || trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
+          const dateFlagIncluds = [
+            ARG_FLAGS.CURRENT_DATE,
+            'currentDate',
+            ARG_FLAGS.CURRENT_DATE_TIME,
+            ARG_FLAGS.CURRENT_DATE_EXCLUDE
+          ]
+          if (dateFlagIncluds.includes((trimValue || '').trim())) {
             if (trimValue === ARG_FLAGS.CURRENT_DATE_TIME) {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
+            } else if (trimValue === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+              defaultVal = dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
             } else {
               defaultVal = formatDate(new Date(), 'yyyy-MM-dd')
             }

package/src/utils/render.jsx

@@ -35,6 +35,7 @@ import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../comp
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import { h } from 'vue'
+import dayjs from 'dayjs'
 
 // 解析配置中的defStyle属性
 export function parseDefStyle(defStyle) {
@@ -59,6 +60,8 @@ function deepParseFnStr(obj, refVal) {
             obj[key] = refVal || ''
           } else if (obj[key] === ARG_FLAGS.CURRENT_DATE) {
             obj[key] = formatDate(new Date(), 'yyyy-MM-dd')
+          } else if (obj[key] === ARG_FLAGS.CURRENT_DATE_EXCLUDE) {
+            obj[key] = dayjs(new Date()).add(1, 'day').format('YYYY-MM-DD')
           } else {
             const { checked, val } = preserveCheck(key, obj[key])
             if (checked) {