@epxing/core 5.3.0-beta.2 → 5.3.0-beta.4

package/src/router/public.js

@@ -3,7 +3,7 @@ import routes, { beforeEach } from './config'
 
 export const routerConfig = { routes, beforeEach }
 
-// 平台路由使用延迟注册的 component/business 视图，由产品按需安装。
+// 基础路由页由 core 安装；页面渲染组件和可选业务视图由产品按需安装。
 export function createFrameRouter (options = {}) {
   const { beforeEach: guard = beforeEach, ...routerOptions } = options
   const router = createRouter({ history: createWebHashHistory(), routes, ...routerOptions })

package/src/runtime-services.js

@@ -41,7 +41,7 @@ export function registerRouteComponents (components) {
 export function runtimeRouteComponent (name) {
   return async () => {
     const component = routeComponents.get(name)
-    if (!component) throw new Error(`[epx/core] 路由组件 ${name} 尚未注册，请安装 component/business 或传入 routeComponents`)
+    if (!component) throw new Error(`[epx/core] 路由组件 ${name} 尚未注册，请安装提供该页面的 components/business 包或传入 routeComponents`)
     return component
   }
 }

package/src/runtime-utils/fieldFactory.js

@@ -1,179 +1,179 @@
-import { runtimeStore } from '../runtime-services'
-import { ADD_LIST, ADD_META } from '@epxing/core/src/store/actions'
-import { isString } from 'lodash-es'
-export class FieldFactory {
-  constructor (store = runtimeStore) {
-    this.store = store
-  }
-  // 创建字段配置
-  async createFields ({ fields, fieldScope, meta, pageType = 'DETAIL', metaId = '', metaViewId, hiddenFields = [], defaultFieldConfigs = {}, type = 'list' }) {
-    const fieldConfigMaps = []
-    let metaView = null
-    // 走 getter 而不是直接读 state，读取本身会刷新缓存的「最近使用」记录，避免被淘汰
-    let newMeta = meta || this.store.getters.getMetaById(`${metaId}`)
-    if (!newMeta) {
-      newMeta = await this.store.dispatch({ // 加回调
-        type: ADD_META,
-        metaId: metaId
-      })
-    }
-    if (newMeta.metaView) {
-      metaView = newMeta.metaView[metaViewId]
-    }
-    const metaViewFieldMap = {}
-
-    if (metaView && metaView.fields) {
-      const metaViewFields = JSON.parse(metaView.fields)
-      metaViewFields.forEach(item => {
-        if (typeof item !== 'string') {
-          metaViewFieldMap[item.attriName] = item
-        }
-      })
-    }
-    if (!fields || Object.keys(fields).length === 0) {
-      const allFields = [...type === 'form' ? newMeta.getFormFields() : newMeta.getListFields()]
-      if (metaView && metaView.listFields) {
-        fields = JSON.parse(metaView.listFields)
-        if (!fields || fields.length === 0) fields = allFields
-      } else {
-        fields = allFields
-      }
-    }
-    const metaKeyName = newMeta.getKey()
-    const metaKeyType = newMeta.getKeyType()
-    for (let i = 0; i < fields.length; i++) {
-      let fieldConfig = {} // 字段配置信息
-      const field = fields[i]
-      if (field === null || field === undefined) continue
-      const metaViewFieldConfig = metaViewFieldMap[field.attriName || field] || {}
-      if (isString(field)) {
-        fieldConfig = { attriName: field, ...metaViewFieldConfig }
-      } else {
-        fieldConfig = { ...field, ...metaViewFieldConfig }
-      }
-      if (fieldConfig.type === 'meta') {
-        const relation = newMeta.relatedEntitys.find(item => item.flag === fieldConfig.attriName)
-        if (relation) {
-          if (!fieldConfig.attriLabel) fieldConfig.attriLabel = relation.title
-        }
-      }
-      if (!fieldConfig.attriName) {
-        continue
-      }
-      if (defaultFieldConfigs[fieldConfig.attriName]) {
-        fieldConfig = { ...defaultFieldConfigs[fieldConfig.attriName], ...fieldConfig }
-      }
-
-      if (fieldConfig.attriName === metaKeyName && (fieldConfig.state || pageType) !== 'SEARCH' && fieldConfig.state !== 'DETAIL') {
-        if (metaKeyType !== 'assigned') {
-          fieldConfig.state = 'HIDDEN'
-        } else {
-          const { dataType } = newMeta.attributes[metaKeyName]
-          if (dataType === 'derive') {
-            if (pageType === 'EDIT' || pageType === 'ADD') {
-              fieldConfig.state = 'HIDDEN'
-            }
-          }
-        }
-      }
-      if (!fieldConfig.state) fieldConfig.state = pageType
-
-      const isHidden = hiddenFields.find(item => fieldConfig.attriName === (item.attriName || item))
-      if (isHidden) {
-        fieldConfig.state = 'HIDDEN'
-      }
-
-      // 无效字段
-      if (fieldConfig.state && fieldConfig.state === 'INVALID') {
-        fieldConfigMaps.push(fieldConfig)
-        continue
-      }
-
-      // 隐含字段
-      // if (fieldConfig.state && fieldConfig.state === 'HIDDEN') {
-      //   fieldConfigMaps.push(fieldConfig)
-      //   continue
-      // }
-
-      let fieldFromMetaId = newMeta.getId()
-      let fieldFromMeta = newMeta
-      let fieldName = fieldConfig.attriName
-
-      if (fieldName.indexOf('|') > -1) { // 关联字段
-        const fieldNameArray = fieldName.split('|')
-        fieldName = fieldNameArray[fieldNameArray.length - 1]
-        for (let i = 0; i < fieldNameArray.length - 1; i++) {
-          fieldFromMetaId = fieldFromMeta.getRelationIdByMetaId(fieldNameArray[i])
-          if (!fieldFromMetaId) break
-          fieldFromMeta = this.store.getters.getMetaById(fieldFromMetaId)
-          if (!fieldFromMeta) {
-            fieldFromMeta = await this.store.dispatch({ // 加回调
-              type: ADD_META,
-              metaId: fieldFromMetaId
-            })
-          }
-        }
-      }
-      fieldConfig = this.createFieldConfig({ fieldFromMeta, fieldConfig: { ...fieldConfig }, fieldName })
-      // 判断字段权限
-      if (fieldScope && fieldConfig.type !== 'meta') {
-        const type = fieldConfig.state === 'ADD' || fieldConfig.state === 'EDIT' ? '2' : '1'
-        const scope = fieldScope[type]
-        if (scope) {
-          if (fieldConfig.dataType !== 'custom' && !scope.includes(fieldConfig.attriName)) {
-            continue
-          }
-        }
-      }
-      if (fieldConfig.attriLabel) {
-        fieldConfigMaps.push(fieldConfig)
-      }
-    }
-    return fieldConfigMaps
-  }
-
-  createFieldConfig ({ fieldFromMeta, fieldConfig, fieldName }) {
-    const attribute = fieldFromMeta.getAttribute(fieldName) || {}
-    attribute.entityId = fieldFromMeta.id
-    fieldConfig.attribute = { ...attribute, ...(fieldConfig.attribute || {}) }
-    if (!fieldConfig.attriLabel) fieldConfig.attriLabel = attribute.label
-    // if(!fieldConfig.fieldName) fieldConfig.fieldName = fieldName;
-    if (!fieldConfig.dataType) fieldConfig.dataType = attribute.dataType
-    if (!fieldConfig.codeKey) {
-      if (fieldConfig.dataType === 'list') fieldConfig.codeKey = attribute.codeKey
-      else fieldConfig.codeKey = attribute.relatedEntity || attribute.codeKey
-    }
-    if (!fieldConfig.isRequired) fieldConfig.isRequired = attribute.isRequired
-    if (fieldConfig.state === 'EDIT' || fieldConfig.state === 'ADD' || fieldConfig.state === 'SEARCH') {
-      if (fieldConfig.dataType === 'list' || fieldConfig.dataType === 'treeList' || fieldConfig.dataType === 'radio' || fieldConfig.dataType === 'multibox') {
-        this.setList(fieldConfig.dataType, fieldConfig.codeKey, fieldConfig.attribute)
-      } else if (fieldConfig.dataType === 'object') {
-      // this.setList(fieldConfig.dataType, fieldConfig.codeKey)
-      }
-    }
-
-    if (fieldConfig.dataType === 'formula') {
-      fieldConfig.submitValue = false
-      if (fieldConfig.state === 'EDIT' || fieldConfig.state === 'ADD') {
-        fieldConfig.state = 'HIDDEN'
-      }
-    }
-    if (fieldConfig.fieldLabel) fieldConfig.attriLabel = fieldConfig.fieldLabel
-    if (fieldConfig.emptyText) fieldConfig.placeholder = fieldConfig.emptyText
-    return fieldConfig
-  }
-
-  setList (dataType, codeKey, { optionType }) {
-    this.store.dispatch({
-      type: ADD_LIST,
-      key: codeKey,
-      dataType: optionType || dataType
-    })
-  }
-}
-
-export function createFieldFactory (store) {
-  return new FieldFactory(store)
-}
-
-export default createFieldFactory()
+import { runtimeStore } from '../runtime-services'
+import { ADD_LIST, ADD_META } from '@epxing/core/src/store/actions'
+import { isString } from 'lodash-es'
+export class FieldFactory {
+  constructor (store = runtimeStore) {
+    this.store = store
+  }
+  // 创建字段配置
+  async createFields ({ fields, fieldScope, meta, pageType = 'DETAIL', metaId = '', metaViewId, hiddenFields = [], defaultFieldConfigs = {}, type = 'list' }) {
+    const fieldConfigMaps = []
+    let metaView = null
+    // 走 getter 而不是直接读 state，读取本身会刷新缓存的「最近使用」记录，避免被淘汰
+    let newMeta = meta || this.store.getters.getMetaById(`${metaId}`)
+    if (!newMeta) {
+      newMeta = await this.store.dispatch({ // 加回调
+        type: ADD_META,
+        metaId: metaId
+      })
+    }
+    if (newMeta.metaView) {
+      metaView = newMeta.metaView[metaViewId]
+    }
+    const metaViewFieldMap = {}
+
+    if (metaView && metaView.fields) {
+      const metaViewFields = JSON.parse(metaView.fields)
+      metaViewFields.forEach(item => {
+        if (typeof item !== 'string') {
+          metaViewFieldMap[item.attriName] = item
+        }
+      })
+    }
+    if (!fields || Object.keys(fields).length === 0) {
+      const allFields = [...type === 'form' ? newMeta.getFormFields() : newMeta.getListFields()]
+      if (metaView && metaView.listFields) {
+        fields = JSON.parse(metaView.listFields)
+        if (!fields || fields.length === 0) fields = allFields
+      } else {
+        fields = allFields
+      }
+    }
+    const metaKeyName = newMeta.getKey()
+    const metaKeyType = newMeta.getKeyType()
+    for (let i = 0; i < fields.length; i++) {
+      let fieldConfig = {} // 字段配置信息
+      const field = fields[i]
+      if (field === null || field === undefined) continue
+      const metaViewFieldConfig = metaViewFieldMap[field.attriName || field] || {}
+      if (isString(field)) {
+        fieldConfig = { attriName: field, ...metaViewFieldConfig }
+      } else {
+        fieldConfig = { ...field, ...metaViewFieldConfig }
+      }
+      if (fieldConfig.type === 'meta') {
+        const relation = newMeta.relatedEntitys.find(item => item.flag === fieldConfig.attriName)
+        if (relation) {
+          if (!fieldConfig.attriLabel) fieldConfig.attriLabel = relation.title
+        }
+      }
+      if (!fieldConfig.attriName) {
+        continue
+      }
+      if (defaultFieldConfigs[fieldConfig.attriName]) {
+        fieldConfig = { ...defaultFieldConfigs[fieldConfig.attriName], ...fieldConfig }
+      }
+
+      if (fieldConfig.attriName === metaKeyName && (fieldConfig.state || pageType) !== 'SEARCH' && fieldConfig.state !== 'DETAIL') {
+        if (metaKeyType !== 'assigned') {
+          fieldConfig.state = 'HIDDEN'
+        } else {
+          const { dataType } = newMeta.attributes[metaKeyName]
+          if (dataType === 'derive') {
+            if (pageType === 'EDIT' || pageType === 'ADD') {
+              fieldConfig.state = 'HIDDEN'
+            }
+          }
+        }
+      }
+      if (!fieldConfig.state) fieldConfig.state = pageType
+
+      const isHidden = hiddenFields.find(item => fieldConfig.attriName === (item.attriName || item))
+      if (isHidden) {
+        fieldConfig.state = 'HIDDEN'
+      }
+
+      // 无效字段
+      if (fieldConfig.state && fieldConfig.state === 'INVALID') {
+        fieldConfigMaps.push(fieldConfig)
+        continue
+      }
+
+      // 隐含字段
+      // if (fieldConfig.state && fieldConfig.state === 'HIDDEN') {
+      //   fieldConfigMaps.push(fieldConfig)
+      //   continue
+      // }
+
+      let fieldFromMetaId = newMeta.getId()
+      let fieldFromMeta = newMeta
+      let fieldName = fieldConfig.attriName
+
+      if (fieldName.indexOf('|') > -1) { // 关联字段
+        const fieldNameArray = fieldName.split('|')
+        fieldName = fieldNameArray[fieldNameArray.length - 1]
+        for (let i = 0; i < fieldNameArray.length - 1; i++) {
+          fieldFromMetaId = fieldFromMeta.getRelationIdByMetaId(fieldNameArray[i])
+          if (!fieldFromMetaId) break
+          fieldFromMeta = this.store.getters.getMetaById(fieldFromMetaId)
+          if (!fieldFromMeta) {
+            fieldFromMeta = await this.store.dispatch({ // 加回调
+              type: ADD_META,
+              metaId: fieldFromMetaId
+            })
+          }
+        }
+      }
+      fieldConfig = this.createFieldConfig({ fieldFromMeta, fieldConfig: { ...fieldConfig }, fieldName })
+      // 判断字段权限
+      if (fieldScope && fieldConfig.type !== 'meta') {
+        const type = fieldConfig.state === 'ADD' || fieldConfig.state === 'EDIT' ? '2' : '1'
+        const scope = fieldScope[type]
+        if (scope) {
+          if (fieldConfig.dataType !== 'custom' && !scope.includes(fieldConfig.attriName)) {
+            continue
+          }
+        }
+      }
+      if (fieldConfig.attriLabel) {
+        fieldConfigMaps.push(fieldConfig)
+      }
+    }
+    return fieldConfigMaps
+  }
+
+  createFieldConfig ({ fieldFromMeta, fieldConfig, fieldName }) {
+    const attribute = fieldFromMeta.getAttribute(fieldName) || {}
+    attribute.entityId = fieldFromMeta.id
+    fieldConfig.attribute = { ...attribute, ...(fieldConfig.attribute || {}) }
+    if (!fieldConfig.attriLabel) fieldConfig.attriLabel = attribute.label
+    // if(!fieldConfig.fieldName) fieldConfig.fieldName = fieldName;
+    if (!fieldConfig.dataType) fieldConfig.dataType = attribute.dataType
+    if (!fieldConfig.codeKey) {
+      if (fieldConfig.dataType === 'list') fieldConfig.codeKey = attribute.codeKey
+      else fieldConfig.codeKey = attribute.relatedEntity || attribute.codeKey
+    }
+    if (!fieldConfig.isRequired) fieldConfig.isRequired = attribute.isRequired
+    if (fieldConfig.state === 'EDIT' || fieldConfig.state === 'ADD' || fieldConfig.state === 'SEARCH') {
+      if (fieldConfig.dataType === 'list' || fieldConfig.dataType === 'treeList' || fieldConfig.dataType === 'radio' || fieldConfig.dataType === 'multibox') {
+        this.setList(fieldConfig.dataType, fieldConfig.codeKey, fieldConfig.attribute)
+      } else if (fieldConfig.dataType === 'object') {
+      // this.setList(fieldConfig.dataType, fieldConfig.codeKey)
+      }
+    }
+
+    if (fieldConfig.dataType === 'formula') {
+      fieldConfig.submitValue = false
+      if (fieldConfig.state === 'EDIT' || fieldConfig.state === 'ADD') {
+        fieldConfig.state = 'HIDDEN'
+      }
+    }
+    if (fieldConfig.fieldLabel) fieldConfig.attriLabel = fieldConfig.fieldLabel
+    if (fieldConfig.emptyText) fieldConfig.placeholder = fieldConfig.emptyText
+    return fieldConfig
+  }
+
+  setList (dataType, codeKey, { optionType }) {
+    this.store.dispatch({
+      type: ADD_LIST,
+      key: codeKey,
+      dataType: optionType || dataType
+    })
+  }
+}
+
+export function createFieldFactory (store) {
+  return new FieldFactory(store)
+}
+
+export default createFieldFactory()