@ibiz/model-core 0.0.9 → 0.0.13

package/src/dataentity/logic/idemerge-param-logic.ts

@@ -0,0 +1,33 @@
+import { IDELogicNode } from './idelogic-node';
+
+/**
+ *
+ * 继承父接口类型值[MERGEPARAM]
+ * @export
+ * @interface IDEMergeParamLogic
+ */
+export interface IDEMergeParamLogic extends IDELogicNode {
+  /**
+   * 目标逻辑参数对象
+   *
+   * @type {string}
+   * 来源  getDstPSDELogicParam
+   */
+  dstDELogicParamId?: string;
+
+  /**
+   * 返回值绑定逻辑参数对象
+   *
+   * @type {string}
+   * 来源  getRetPSDELogicParam
+   */
+  retDELogicParamId?: string;
+
+  /**
+   * 源逻辑参数对象
+   *
+   * @type {string}
+   * 来源  getSrcPSDELogicParam
+   */
+  srcDELogicParamId?: string;
+}

package/src/dataentity/logic/ideprepare-param-logic.ts

@@ -6,4 +6,4 @@ import { IDELogicNode } from './idelogic-node';
  * @export
  * @interface IDEPrepareParamLogic
  */
-export type IDEPrepareParamLogic = IDELogicNode
+export type IDEPrepareParamLogic = IDELogicNode;

package/src/dataentity/logic/ideuibegin-logic.ts

@@ -6,4 +6,4 @@ import { IDEUILogicNode } from './ideuilogic-node';
  * @export
  * @interface IDEUIBeginLogic
  */
-export type IDEUIBeginLogic = IDEUILogicNode
+export type IDEUIBeginLogic = IDEUILogicNode;

package/src/dataentity/logic/ideuilogic-link-cond.ts

@@ -6,4 +6,4 @@ import { IDELogicLinkCondBase } from './idelogic-link-cond-base';
  * @export
  * @interface IDEUILogicLinkCond
  */
-export type IDEUILogicLinkCond = IDELogicLinkCondBase
+export type IDEUILogicLinkCond = IDELogicLinkCondBase;

package/src/dataentity/logic/ideuilogic-link.ts

@@ -77,4 +77,12 @@ export interface IDEUILogicLink extends IModelObject {
    * 来源  isRejectedLink
    */
   rejectedLink?: boolean;
+
+  /**
+   * 子调用连接
+   * @type {boolean}
+   * @default false
+   * 来源  isSubCallLink
+   */
+  subCallLink?: boolean;
 }

package/src/dataentity/logic/ideuilogic-param.ts

@@ -137,6 +137,14 @@ export interface IDEUILogicParam extends IDELogicParamBase {
    */
   entityListParam?: boolean;
 
+  /**
+   * 数据对象字典变量
+   * @type {boolean}
+   * @default false
+   * 来源  isEntityMapParam
+   */
+  entityMapParam?: boolean;
+
   /**
    * 分页查询结果变量
    * @type {boolean}

package/src/dataentity/logic/ideview-logic.ts

@@ -5,4 +5,4 @@ import { IDEUILogic } from './ideuilogic';
  * @export
  * @interface IDEViewLogic
  */
-export type IDEViewLogic = IDEUILogic
+export type IDEViewLogic = IDEUILogic;

package/src/dataentity/uiaction/ideuiaction-group.ts

@@ -5,4 +5,4 @@ import { IUIActionGroup } from '../../view/iuiaction-group';
  * @export
  * @interface IDEUIActionGroup
  */
-export type IDEUIActionGroup = IUIActionGroup
+export type IDEUIActionGroup = IUIActionGroup;

package/src/exports.ts

@@ -431,7 +431,10 @@ export { IAjaxEditor } from './control/iajax-editor';
 export { IButtonBase } from './control/ibutton-base';
 export { IControl } from './control/icontrol';
 export { IControlAction } from './control/icontrol-action';
+export { IControlAttribute } from './control/icontrol-attribute';
 export { IControlContainer } from './control/icontrol-container';
+export { IControlItem } from './control/icontrol-item';
+export { IControlItemNavigatable } from './control/icontrol-item-navigatable';
 export { IControlItemParam } from './control/icontrol-item-param';
 export { IControlLogic } from './control/icontrol-logic';
 export { IControlMDObject } from './control/icontrol-mdobject';
@@ -441,6 +444,7 @@ export { IControlNavParam } from './control/icontrol-nav-param';
 export { IControlNavigatable } from './control/icontrol-navigatable';
 export { IControlObjectNavigatable } from './control/icontrol-object-navigatable';
 export { IControlParam } from './control/icontrol-param';
+export { IControlRender } from './control/icontrol-render';
 export { IControlXDataContainer } from './control/icontrol-xdata-container';
 export { IEditor } from './control/ieditor';
 export { IEditorItem } from './control/ieditor-item';
@@ -627,6 +631,8 @@ export { IDEDELogicLogic } from './dataentity/logic/idedelogic-logic';
 export { IDEDebugParamLogic } from './dataentity/logic/idedebug-param-logic';
 export { IDEEndLogic } from './dataentity/logic/ideend-logic';
 export { IDEFLogic } from './dataentity/logic/ideflogic';
+export { IDEFilterParam2Logic } from './dataentity/logic/idefilter-param2-logic';
+export { IDEFilterParamLogic } from './dataentity/logic/idefilter-param-logic';
 export { IDELogic } from './dataentity/logic/idelogic';
 export { IDELogicLink } from './dataentity/logic/idelogic-link';
 export { IDELogicLinkCond } from './dataentity/logic/idelogic-link-cond';

package/src/imodel-object.ts

@@ -13,4 +13,6 @@ export interface IModelObject {
   name?: string;
 
   codeName?: string;
+
+  userParam?: Record<string, string>;
 }

package/src/res/ilanguage-res.ts

@@ -44,13 +44,6 @@ export interface ILanguageRes extends IModelObject {
     | 'COMMON'
     | 'OTHER';
 
-  /**
-   * 名称
-   * @type {string}
-   * 来源  getName
-   */
-  name?: string;
-
   /**
    * 引用标志
    * @type {boolean}

package/src/view/iuiaction-group-detail.ts

@@ -1,4 +1,3 @@
-import { ISysImage } from '../exports';
 import { IModelObject } from '../imodel-object';
 
 /**
@@ -86,11 +85,4 @@ export interface IUIActionGroupDetail extends IModelObject {
    * 来源  isShowIcon
    */
   showIcon?: boolean;
-
-  /**
-   * 系统图片
-   * @type {ISysImage}
-   * 来源  getPSSysImage
-   */
-  sysImage?: ISysImage;
 }