resolver-egretimp-plus 0.1.94 → 0.1.96

package/package.json

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

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/theme/element/components/form.scss

@@ -38,6 +38,12 @@
       align-items: center;
       height: 16px;
       word-break: break-word;
+      .custom-label-require {
+        &::first-letter {
+          color: #f5222d;
+          margin-right: 3px
+        }
+      }
       .custom-label-content {
         display: -webkit-box;
         line-height: 16px;

package/src/utils/render.jsx

@@ -981,11 +981,12 @@ function createFormLable(config, lang = 'zh') {
       <span
         onMouseenter={(e) => labelMouseEnenter(e, config, lang)}
         onMouseout={() => config._labelShowTip = false}
-        class="custom-label-content" style={config.labelStyle}
+        class={`custom-label-content ${required ? 'custom-label-require' : ''}`} style={config.labelStyle}
         onClick={() => config.onLabelClick && config.onLabelClick?.(config)}
       >
-        {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null}
-        <span>{lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}</span>
+        {/* {required ? <span style="color: #f5222d; margin-right: 3px">*</span> : null} */}
+        {required ? '*' : null}
+        {lang.indexOf('zh') > -1 ? (config.labelZh || config.metaNameZh) : (config.labelEn || config.metaNameEn)}
       </span>
       {
         config._labelShowTip ?