resolver-egretimp-plus 0.0.21 → 0.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.21",
+  "version": "0.0.29",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",
@@ -28,6 +28,7 @@
     "babel-loader": "^9.1.3",
     "consola": "^3.2.3",
     "core-js-pure": "^3.38.1",
+    "crypto-js": "^4.2.0",
     "css-loader": "^7.1.2",
     "dayjs": "^1.11.13",
     "element-plus": "^2.7.6",
@@ -40,6 +41,7 @@
     "lodash-es": "^4.17.21",
     "mini-css-extract-plugin": "^2.9.0",
     "node-sass": "^9.0.0",
+    "qs": "^6.13.0",
     "sass": "1.77.6",
     "sass-loader": "^14.2.1",
     "vue-loader": "^17.4.2",

package/scripts/webpack.config.js

@@ -71,7 +71,9 @@ module.exports = {
   },
   externals: {
     vue: 'vue',
-    'cmid-dev': 'cmid-dev',
+    'cmid': 'cmid',
+    'cmid/lib/toast': 'cmid/lib/toast',
+    'cmid/lib/fullloading': 'cmid/lib/fullloading',
     'element-plus': 'element-plus',
     'vue-router': 'vue-router',
     'element-plus/es/hooks/index.mjs': 'element-plus/es/hooks/index.mjs',

package/src/api/builtIn.js

@@ -1,2 +1,4 @@
 export const QUERY_PAGE_CONFIG_DATA = '/sa-lcp/api/v1/pageConfig/queryPageConfigData'
-export const LCP_LOGIN = '/sa-lcp/login'
+export const LCP_LOGIN = '/sa-lcp/login'
+export const GET_SYS_PARAM_CACHE = '/sa-lcp/api/v1/sysparam/getSysParamCache'
+export const REFRESH_TOKEN = '/sa-lcp/changePwd/refreshToken'

package/src/components/helper/button.js

@@ -1,6 +1,4 @@
-import { ElMessage } from 'element-plus';
-
-export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData}) {
+export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData, messageInstance}) {
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
     const url = service.serviceCode
@@ -10,7 +8,7 @@ export async function dispatchClickEvents  ({serviceList = [], axiosInstance, re
       data: reqData
     }))
     if (!ret?.data?.success) {
-      ElMessage.error(ret?.data?.resultMessage || '')
+      messageInstance?.value?.error(ret?.data?.resultMessage || '')
       await Promise.reject()
     }
   }

package/src/components/helper/resolver.js

@@ -0,0 +1,29 @@
+export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
+  const loadServices = services.filter(ser => ser.eventType == '1')
+  for (let i = 0; i < loadServices.length; i++) {
+    const service = loadServices[i]
+    const url = service.serviceCode
+    const ret = await (axiosInstance.value && axiosInstance.value({
+      url,
+      method: "post",
+      data: reqData
+    }))
+    // const ret = await (new Promise((res) => {
+    //   setTimeout(() => {
+    //     res({
+    //       data: {
+    //         success: true,
+    //         result: {
+    //           studentId: 121212
+    //         }
+    //       }
+    //     })
+    //   }, 3000);
+    // }))
+    if (!ret?.data?.success) {
+      messageInstance?.value?.error(ret?.data?.resultMessage || '')
+      await Promise.reject()
+    }
+    respCb && respCb(ret?.data?.result)
+  }
+}

package/src/components/icons/question-filled.vue

@@ -1,10 +1,11 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
+  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024"><path fill="currentColor" d="M512 64a448 448 0 1 1 0 896 448 448 0 0 1 0-896m0 192a58.43 58.43 0 0 0-58.24 63.744l23.36 256.384a35.072 35.072 0 0 0 69.76 0l23.296-256.384A58.43 58.43 0 0 0 512 256m0 512a51.2 51.2 0 1 0 0-102.4 51.2 51.2 0 0 0 0 102.4"/></svg>
+  <!-- <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
     <path
       fill="currentColor"
       d="M512 64a448 448 0 1 1 0 896 448 448 0 0 1 0-896m23.744 191.488c-52.096 0-92.928 14.784-123.2 44.352-30.976 29.568-45.76 70.4-45.76 122.496h80.256c0-29.568 5.632-52.8 17.6-68.992 13.376-19.712 35.2-28.864 66.176-28.864 23.936 0 42.944 6.336 56.32 19.712 12.672 13.376 19.712 31.68 19.712 54.912 0 17.6-6.336 34.496-19.008 49.984l-8.448 9.856c-45.76 40.832-73.216 70.4-82.368 89.408-9.856 19.008-14.08 42.24-14.08 68.992v9.856h80.96v-9.856c0-16.896 3.52-31.68 10.56-45.76 6.336-12.672 15.488-24.64 28.16-35.2 33.792-29.568 54.208-48.576 60.544-55.616 16.896-22.528 26.048-51.392 26.048-86.592q0-64.416-42.24-101.376c-28.16-25.344-65.472-37.312-111.232-37.312m-12.672 406.208a54.27 54.27 0 0 0-38.72 14.784 49.4 49.4 0 0 0-15.488 38.016c0 15.488 4.928 28.16 15.488 38.016A54.85 54.85 0 0 0 523.072 768c15.488 0 28.16-4.928 38.72-14.784a51.52 51.52 0 0 0 16.192-38.72 51.97 51.97 0 0 0-15.488-38.016 55.94 55.94 0 0 0-39.424-14.784"
     />
-  </svg>
+  </svg> -->
 </template>
 <script setup>
 defineOptions({

package/src/components/loading/loading.vue

@@ -5,21 +5,19 @@
         <span></span>
         <span></span>
         <span></span>
-        <div class="word" style="display: block">{{ worldTip }}</div>
+        <!-- <div class="word" style="display: block">{{ worldTip }}</div> -->
       </div>
     </div>
   </div>
 </template>
 <script>
 /* eslint-disable */
-import { useLocaleStoreWithOut } from '@/stores/modules/locale'
 import { computed } from 'vue'
 export default {
   name: 'CmiLoading',
-  setup() {
-    const localeStore = useLocaleStoreWithOut()
+  setup(props) {
     const lang = computed(() => {
-      return localeStore.getLocale
+      return props.lang
     })
     return {
       lang

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

@@ -2,7 +2,7 @@
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { dispatchClickEvents } from '../helper/button-H5.js';
+import { dispatchClickEvents } from '../helper/button.js';
 
 const appContext = getCurrentInstance()?.appContext
 
@@ -41,6 +41,7 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
+const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -71,7 +72,9 @@ const buttonAction = () => {
   if (PageServiceMapVOList?.length) {
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
-      axiosInstance: _axiosInstance
+      axiosInstance: _axiosInstance,
+      reqData: rootValue?.value,
+      messageInstance
     })
   }
 }

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

@@ -1,21 +1,22 @@
 <script setup>
 import { computed, defineProps, inject, useAttrs } from 'vue'
-import { commonPropsType } from '../../utils/index.js'
+import { commonPropsType, hasOwn } from '../../utils/index.js'
 
 const lang = inject('lang')
 const modelValue = defineModel()
 const props = defineProps({
   ...commonPropsType,
 })
+
 const calcProps = computed(() => {
   return {
     title: lang?.value?.indexOf('zh') > -1 ? props.config?.metaNameZh : props.config?.metaNameEn,
     desc: modelValue.value || props.config?.desc,
     content: props.config?.content,
-    to: props.config?.min,
+    to: props.config?.toHref,
     islink: props.config?.islink === '1',
     icon: props.config?.icon,
-    selfadaption: props.config?.selfadaption === '1',
+    selfadaption: hasOwn(props.config, 'selfadaption') ? props.config.selfadaption === '1' : true,
     noborder: props.noborder === '1',
   }
 })
@@ -27,8 +28,10 @@ const onChange = (e) => {
 </script>
 
 <template>
-  <cmi-cell
-    :value="modelValue" v-bind="{ ...attrs, ...calcProps}" 
-    @change="onChange"
-  ></cmi-cell>
+  <cmi-cell-group>
+    <cmi-cell
+      :value="modelValue" v-bind="{ ...attrs, ...calcProps}" 
+      @change="onChange"
+    ></cmi-cell>
+  </cmi-cell-group>
 </template>

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

@@ -53,6 +53,7 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
+const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -83,7 +84,8 @@ const buttonAction = () => {
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
       axiosInstance: _axiosInstance,
-      reqData: rootValue?.value
+      reqData: rootValue?.value,
+      messageInstance
     })
   }
 }

package/src/enums/index.js

@@ -1,3 +1,10 @@
-export const ACCOUNT = ''
-export const PASSWORD = ''
-export const AUTH_CODE = ''
+import { LCP_LOGIN } from "../api/builtIn"
+
+export const USER_NAME = 'lcpsupport'
+export const PASSWORD = '8ik,*IK<'
+export const USER_TYPE = '1'
+export const AUTH_CODE = '9887'
+
+export const NOT_AUTH_APIS = [
+  LCP_LOGIN
+]

package/src/hooks/pageConfig.js

@@ -1,5 +1,7 @@
 import { parsePageConfig } from "../utils"
 import { ref } from 'vue'
+import { buildInRequest } from "../utils/request"
+import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
 
 export function usePageConfig() {
   const pageConfigRef = ref(null)
@@ -19,74 +21,50 @@ export function usePageConfig() {
   }
 }
 
-// export function usePageConfig() {
-//   const pageConfig = ref(null)
-//   function getPageConfig(reqData) {
-//     queryPageConfigData(reqData).then(ret => {
-//       if (ret.data.success) {
-//         pageConfig.value = ret.data.result
-//         return
-//       }
-//       ElMessage.error(ret.data.resultMessage)
-//     })
-//   }
-//   function getSelects() {}
-//   const selects = ref({
-//     treeListValue: [
-//       {
-//         id: 1,
-//         label: 'Level one 1',
-//         children: [
-//           {
-//             id: 4,
-//             label: 'Level two 1-1',
-//             children: [
-//               {
-//                 id: 9,
-//                 label: 'Level three 1-1-1',
-//               },
-//               {
-//                 id: 10,
-//                 label: 'Level three 1-1-2',
-//               },
-//             ],
-//           },
-//         ],
-//       },
-//       {
-//         id: 2,
-//         label: 'Level one 2',
-//         children: [
-//           {
-//             id: 5,
-//             label: 'Level two 2-1',
-//           },
-//           {
-//             id: 6,
-//             label: 'Level two 2-2',
-//           },
-//         ],
-//       },
-//       {
-//         id: 3,
-//         label: 'Level one 3',
-//         children: [
-//           {
-//             id: 7,
-//             label: 'Level two 3-1',
-//           },
-//           {
-//             id: 8,
-//             label: 'Level two 3-2',
-//           },
-//         ],
-//       },
-//     ]
-//   })
-//   return {
-//     pageConfig,
-//     getPageConfig,
-//     getSelects,
-//     selects
-//   }
-// }
+export function useBuildInData(messageTipInstance, loadingInstance) {
+  const pageConfig = ref(null)
+  function getPageConfig(reqData) {
+    if (loadingInstance.start && typeof loadingInstance.start === 'function') {
+      loadingInstance.start()
+    } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
+      loadingInstance.show()
+    }
+    buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
+      if (ret.data.success) {
+        pageConfig.value = ret.data.result
+        getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
+        return
+      }
+      messageTipInstance?.error(ret.data.resultMessage)
+    }).catch(() => {
+      if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+        loadingInstance.finish()
+      } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+        loadingInstance.hide()
+      }
+    })
+  }
+  const selects = ref({})
+  function getSelects(tenantId) {
+    buildInRequest(GET_SYS_PARAM_CACHE, {
+      tenantId
+    }).then(ret => {
+      if (ret.data.success) {
+        selects.value = JSON.parse(ret.data.result || '{}')
+        return
+      }
+      messageTipInstance?.error(ret.data.resultMessage)
+    }).finally(() => {
+      if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
+        loadingInstance.finish()
+      } else if (loadingInstance.hide && typeof loadingInstance.hide === 'function') {
+        loadingInstance.hide()
+      }
+    })
+  }
+  return {
+    pageConfig,
+    getPageConfig,
+    selects
+  }
+}

package/src/index.jsx

@@ -1,10 +1,11 @@
 import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
-import { usePageConfig } from './hooks/pageConfig'
+import { useBuildInData, usePageConfig } from './hooks/pageConfig'
 import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
+import { executeLoadServices } from "./components/helper/resolver.js"
 export default {
   name: 'Resolver',
   props: {
@@ -72,9 +73,22 @@ export default {
     getNativeComps: {
       type: Function,
       default: () => ({composeComponents: {}})
+    },
+    loadingInstance: {
+      type: Object,
+      default: () => null
+    },
+    messageInstance: {
+      type: Object,
+      default: () => null
+    },
+    loadEvnetsReq: {
+      type: Object,
+      default: () => ({})
     }
   },
   setup(props, { emit, attrs, expose }) {
+    let nativeDataLoad = ref(false)
     let axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig
@@ -87,14 +101,50 @@ export default {
     }, {
       immediate: true
     })
+
+    
+    const dataLoad = computed(() => {
+      return props.dataLoad || nativeDataLoad.value
+    })
     const instance = getCurrentInstance()
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
+
     initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+    // 触发加载事件执行
+    executeLoadServices(
+      props.config?.pmPageServiceMapVOList || [],
+      {
+        messageInstance: toRef(props, 'messageInstance'),
+        axiosInstance,
+        reqData: props.loadEvnetsReq,
+        respCb: (result) => {
+          nativeDataLoad.value = true
+          emit('update:modelValue', result)
+          emit('loadEvnetsCompleted', result)
+        }
+      }
+    )
 
     watch(toRef(props, 'config'), () => {
       initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+      executeLoadServices(
+        props.config?.pmPageServiceMapVOList || [],
+        {
+          messageInstance: toRef(props, 'messageInstance'),
+          axiosInstance,
+          reqData: props.loadEvnetsReq,
+          respCb: (result) => {
+            debugger
+            nativeDataLoad.value = true
+            emit('update:modelValue', result)
+            emit('loadEvnetsCompleted', result)
+          }
+        }
+      )
     })
     
+    provide('_messageInstance', toRef(props, 'messageInstance'))
+    provide('_loadingInstance', toRef(props, 'loadingInstance'))
     provide('_getNativeComps', props.getNativeComps)
     provide('pageConfig', pageConfigRef)
     const dynamicMapComp = reactive({})
@@ -108,7 +158,7 @@ export default {
     provide('selects', toRef(props, 'selects'))
     provide('rootValue', toRef(props, 'modelValue')) // 绑定进入的跟数据
     provide('lang', toRef(props, 'lang'))
-    provide('dataLoad', toRef(props, 'dataLoad')) // 是否可以开始执行规则初始化
+    provide('dataLoad', dataLoad) // 是否可以开始执行规则初始化
     provide('dialogComponents', props.dialogComponents) // 是否可以开始执行规则初始化
     provide('_isH5', toRef(props, 'isH5')) // 是否是H5配置
 

package/src/resolver-H5.vue

@@ -1,13 +1,29 @@
 <script setup>
 import getNativeComps from './components/patchComponents-H5.js'
 import { useAttrs } from 'vue';
-import Resolver from './index.jsx'
+import Resolver from './resolver-common.vue'
+import CmiToast from "cmid/lib/toast"
+import CmiFullLoading from "cmid/lib/fullloading"
+
+const props = defineProps({
+  loadingInstance: {
+    type: [Object, Function],
+    default: () => CmiFullLoading
+    // default: () => null
+  },
+  messageInstance: {
+    type: [Object, Function],
+    default: () => CmiToast
+    // default: () => null
+  },
+})
 
 defineOptions({
   inheritAttrs: false
 })
 const attrs = useAttrs()
+
 </script>
 <template>
-  <Resolver v-bind="attrs" :getNativeComps="getNativeComps"></Resolver>
+  <Resolver v-bind="attrs" :isH5="true" :getNativeComps="getNativeComps" :messageInstance="props.messageInstance" :loadingInstance="props.loadingInstance"></Resolver>
 </template>

package/src/resolver-common.vue

@@ -0,0 +1,45 @@
+<script setup>
+import { computed, useAttrs } from 'vue';
+import Resolver from './index.jsx'
+import { useBuildInData } from './hooks/pageConfig';
+
+const props = defineProps({
+  busiIdentityId: String,
+  selects: {
+    type: Object,
+    default: () => ({})
+  },
+  getNativeComps: {
+    type: Function,
+    default: () => ({composeComponents: {}})
+  },
+  loadingInstance: {
+    type: Object,
+    default: () => null
+  },
+  messageInstance: {
+    type: Object,
+    default: () => null
+  },
+})
+defineOptions({
+  inheritAttrs: false
+})
+const attrs = useAttrs()
+
+const { getPageConfig, pageConfig, selects } = useBuildInData(props.messageInstance, props.loadingInstance)
+getPageConfig({
+  busiIdentityId: props.busiIdentityId,
+  queryPageMeta: '1',
+  queryPageService: '1',
+})
+const allSelects = computed(() => {
+  return {
+    ...props.selects,
+    ...selects.value
+  }
+})
+</script>
+<template>
+  <Resolver v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
+</template>

package/src/resolver-web.vue

@@ -1,13 +1,28 @@
 <script setup>
 import getNativeComps from './components/patchComponents-web'
+import { ElMessage } from "element-plus"
+import { loadingInstance } from './components/loading'
 import { useAttrs } from 'vue';
-import Resolver from './index.jsx'
+import Resolver from './resolver-common.vue'
+
+const props = defineProps({
+  loadingInstance: {
+    type: [Object, Function],
+    default: () => loadingInstance
+    // default: () => null
+  },
+  messageInstance: {
+    type: [Object, Function],
+    default: () => ElMessage
+  },
+})
 
 defineOptions({
   inheritAttrs: false
 })
 const attrs = useAttrs()
+
 </script>
 <template>
-  <Resolver v-bind="attrs" :getNativeComps="getNativeComps"></Resolver>
+  <Resolver v-bind="attrs" :getNativeComps="getNativeComps" :messageInstance="props.messageInstance" :loadingInstance="props.loadingInstance"></Resolver>
 </template>

package/src/theme/element/components/form.scss

@@ -27,6 +27,10 @@
         -webkit-box-orient: vertical;
         text-align: right;
       }
+      .label-tip {
+        display: flex;
+        align-items: center;
+      }
     }
   }
   .label-position-right {