resolver-egretimp-plus 0.1.78 → 0.1.80

package/package.json

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

package/src/analysisComponent.jsx

@@ -53,6 +53,7 @@ export default {
       return ret
     })
     useConfigLoad(props.config)
+    const configsSet = inject('_configsSet')
     const ruleExecuter = inject('_ruleExecuter')
     const dialogReq = inject('_dialogReq', {})
     const requestTraceId = inject('requestTraceId')
@@ -231,14 +232,17 @@ export default {
       definePrivatelyProp(config, 'dynamicMapComp', dynamicMapComp)
       
       // 如果已经有dynamicHireRelat值的时候，就不需要再进行以下赋值了
-      if (config?.dynamicHireRelat_bak && props.mode !== 'operate') {
+      if (
+        config?.dynamicHireRelat_bak && !configsSet?.has(config)
+        // && props.mode !== 'operate'
+      ) {
         definePrivatelyProp(config, 'dynamicHireRelat', `${config.dynamicHireRelat_bak}__@__${props.mode}__`)
       } else {
         const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
         definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
         config.dynamicHireRelat_bak = dynamicHireRelat
       }
-      
+      configsSet?.add(config) // 搜集所有的config
       config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
       return config
     })

package/src/components/helper/dock.js

@@ -78,13 +78,14 @@ export const getFeiShuTokensApi = async (params) => {
 
 // https://cmitry.feishu.cn/docs/doccnCtL96HOryMUErjXBMBrn4c#
 // 选人选部门Select组件（原生js版本）
-const token = ''
+let token = ''
 export const useSelEmployeeJs = () => {
   const getToken = async () => {
     if (token) {
       return token
     }
     let { data: { result } } = await getFeiShuTokensApi({ "busiType": "CONSULTING_HELP" })
+    token = result
     return result
   }
 
@@ -109,10 +110,19 @@ export const useSelEmployeeJs = () => {
     }
     return loadAllResource(urls)
   }
+  const loadScriptDepartment = async () => {
+    const urls = []
+    if (!window._DIC_COMMON_JS_) {
+      const url = `https://ncoa${isLocal ? '-uat' : ''}.cmitry.com/components/lib/call.min.js?ver=${getDateTime()}`
+      urls.push({ type: 'js', url, id: 'callJs' })
+    }
+    return loadAllResource(urls)
+  }
   const initSelUser = (params) => {
     return window.init_selUser(params)
   }
   return {
+    loadScriptDepartment,
     getToken,
     loadStyle,
     loadScript,

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

@@ -1,15 +1,22 @@
 <template>
   <div class="select-employees">
+    <!-- <el-input @focus="showSelUserDialog">
+      <template #suffix>
+        <el-icon style="cursor: pointer;" @click="showSelUserDialog"><SearchIcon /></el-icon>
+      </template>
+    </el-input> -->
     <div :id="metaCode" :style="styleObj" class="xm-select-user" :class="[props.disabled ? 'is-disabled' : '']"></div>
     <div v-if="props.disabled" class="disable-employees"></div>
   </div>
 </template>
 <script setup>
-import { onMounted, inject, watch, defineProps, computed, defineEmits, nextTick } from 'vue';
+import { onMounted, inject, watch, defineProps, computed, defineEmits, nextTick, resolveComponent } from 'vue';
 import { useSelEmployeeJs } from '../helper/dock.js'
-import { commonPropsType } from '../../utils/index.js'
+import { commonPropsType, debounce } from '../../utils/index.js'
 import { useFormItem } from 'element-plus'
 
+// const SearchIcon = resolveComponent('Search')
+// console.log('SearchIcon==:', SearchIcon)
 const { formItem: elFormItem } = useFormItem()
 const emit = defineEmits(['change'])
 const props = defineProps({
@@ -22,6 +29,10 @@ const props = defineProps({
     type: String,
     default: 'user'
   },
+  isFrame: {
+    type: [String, Number],
+    default: '0'
+  },
   placeholder: {
     type: String,
     default: ''
@@ -109,6 +120,24 @@ const initSelEmployee = async () => {
   })
 }
 
+const showSelUserDialog = debounce(async function () {
+  let feiShuTokens = ''
+  const { getToken, loadScriptDepartment } = useSelEmployeeJs()
+  let ret = await Promise.all([getToken(), loadScriptDepartment()])
+  if (ret && ret.length) {
+    feiShuTokens = ret[0]
+    if (!feiShuTokens) return
+  }
+  _DIC_COMMON_JS_.showSelUserDialog({
+    token: feiShuTokens,
+  }, {
+    needCompleteData: false,
+    chooseType: 'all'
+  })?.then((res) => {
+    debugger
+  })
+}, 200)
+
 function seelp(time) {
   return new Promise((resolve) => {
     setTimeout(() => {

package/src/components/packages-web/CustomComponentTable.jsx

@@ -137,7 +137,13 @@ export default {
           if (b[item.prop] === '' || b[item.prop] === undefined || b[item.prop] === null) {
             return item.order === 'descending' ? -1 : 1
           }
-          return (a[item.prop] > b[item.prop] ? (item.order === 'descending' ? -1 : 1) : a[item.prop] === b[item.prop] ? 0 : (item.order === 'descending' ? 1 : -1))
+          let aVal = a[item.prop]
+          let bVal = b[item.prop]
+          if (!Number.isNaN(+(a[item.prop])) && !Number.isNaN(+(b[item.prop]))) {
+            aVal = +(a[item.prop])
+            bVal = +(b[item.prop])
+          }
+          return (aVal > bVal ? (item.order === 'descending' ? -1 : 1) : aVal === bVal ? 0 : (item.order === 'descending' ? 1 : -1))
         })
         return ret
       }, [...(normalTableData.value || [])])

package/src/index.jsx

@@ -183,6 +183,7 @@ export default {
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
+    const configsSet = new Set()
     const dynamicMapComp = reactive({})
     const instance = getCurrentInstance()
     const ruleExecuter = null
@@ -310,6 +311,7 @@ export default {
       toExecuteLoadServices()
     })
     
+    provide('_configsSet', configsSet)
     provide('_builtPolyfillReq', props.builtPolyfillReq)
     provide('_loadModuleCache', props.loadModuleCache)
     provide('_ruleExecuter', ruleExecuter)

package/src/utils/common.js

@@ -1,8 +1,9 @@
 
-import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep } from 'lodash-es'
+import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep, debounce } from 'lodash-es'
 import { isDate } from './is'
 import { isRef } from 'vue'
 export {
+  debounce,
   cloneDeep,
   unionWith
 }

package/src/utils/respone.js

@@ -9,6 +9,9 @@ export const RESULT_CODE = {
 }
 export function resultToast(result = {}, messageInstance, {messageCb, service, compConfig, noSuccessIip = false, resultCodeKey = 'resultCode'} = {}) {
   let ret = false
+  if (result?.baseResponse) {
+    result = result?.baseResponse
+  }
   let cbKey = ''
   const resultMessage = result?.resultMessage || ''