@ibiz/model-core 0.0.10 → 0.0.14

package/src/control/editor/ilist-box.ts

@@ -6,4 +6,4 @@ import { ICodeListEditor } from './icode-list-editor';
  * @export
  * @interface IListBox
  */
-export type IListBox = ICodeListEditor
+export type IListBox = ICodeListEditor;

package/src/control/editor/imail-address.ts

@@ -1,3 +1,4 @@
+import { IAutoComplete } from './iauto-complete';
 import { IPickerEditor } from './ipicker-editor';
 
 /**
@@ -6,4 +7,4 @@ import { IPickerEditor } from './ipicker-editor';
  * @export
  * @interface IMailAddress
  */
-export type IMailAddress = IPickerEditor
+export interface IMailAddress extends IPickerEditor, IAutoComplete {}

package/src/control/editor/imap-picker.ts

@@ -6,4 +6,4 @@ import { IEditor } from '../ieditor';
  * @export
  * @interface IMapPicker
  */
-export type IMapPicker = IEditor
+export type IMapPicker = IEditor;

package/src/control/editor/imdrop-down-list.ts

@@ -6,4 +6,4 @@ import { IDropDownList } from './idrop-down-list';
  * @export
  * @interface IMDropDownList
  */
-export type IMDropDownList = IDropDownList
+export type IMDropDownList = IDropDownList;

package/src/control/editor/impicker.ts

@@ -6,4 +6,4 @@ import { IPicker } from './ipicker';
  * @export
  * @interface IMPicker
  */
-export type IMPicker = IPicker
+export type IMPicker = IPicker;

package/src/control/editor/inumber-range.ts

@@ -6,4 +6,4 @@ import { INumberEditor } from './inumber-editor';
  * @export
  * @interface INumberRange
  */
-export type INumberRange = INumberEditor
+export type INumberRange = INumberEditor;

package/src/control/editor/ioffice.ts

@@ -6,4 +6,4 @@ import { IEditor } from '../ieditor';
  * @export
  * @interface IOffice
  */
-export type IOffice = IEditor
+export type IOffice = IEditor;

package/src/control/editor/ipassword.ts

@@ -6,4 +6,4 @@ import { ITextEditor } from './itext-editor';
  * @export
  * @interface IPassword
  */
-export type IPassword = ITextEditor
+export type IPassword = ITextEditor;

package/src/control/editor/ipicker-editor.ts

@@ -1,13 +1,12 @@
 import { IEditor } from '../ieditor';
 import { INavigateParamContainer } from '../inavigate-param-container';
-import { IValueItemEditor } from './ivalue-item-editor';
 
 /**
  *
  * @export
  * @interface IPickerEditor
  */
-export interface IPickerEditor extends IEditor, INavigateParamContainer, IValueItemEditor {
+export interface IPickerEditor extends IEditor, INavigateParamContainer {
   /**
    * 附加上下文Json字符串
    * @type {string}
@@ -43,10 +42,4 @@ export interface IPickerEditor extends IEditor, INavigateParamContainer, IValueI
    * 来源  isEnablePickupView
    */
   enablePickupView?: boolean;
-
-  appDEDataSetId?: string;
-
-  appDataEntityId?: string;
-
-  valueItemName?: string;
 }

package/src/control/editor/ipicker.ts

@@ -1,5 +1,6 @@
 import { IAutoComplete } from './iauto-complete';
 import { IPickerEditor } from './ipicker-editor';
+import { IValueItemEditor } from './ivalue-item-editor';
 
 /**
  *
@@ -7,7 +8,10 @@ import { IPickerEditor } from './ipicker-editor';
  * @export
  * @interface IPicker
  */
-export interface IPicker extends IPickerEditor, IAutoComplete {
+export interface IPicker
+  extends IPickerEditor,
+    IValueItemEditor,
+    IAutoComplete {
   /**
    * 下拉视图高度[DROPDOWNVIEWHEIGHT]
    * @type {number}

package/src/control/editor/ipredefined.ts

@@ -6,4 +6,4 @@ import { IValueItemEditor } from './ivalue-item-editor';
  * @export
  * @interface IPredefined
  */
-export type IPredefined = IValueItemEditor
+export type IPredefined = IValueItemEditor;

package/src/control/editor/iradio-button-list.ts

@@ -6,4 +6,4 @@ import { ICodeListEditor } from './icode-list-editor';
  * @export
  * @interface IRadioButtonList
  */
-export type IRadioButtonList = ICodeListEditor
+export type IRadioButtonList = ICodeListEditor;

package/src/control/editor/irating.ts

@@ -6,4 +6,4 @@ import { IStepper } from './istepper';
  * @export
  * @interface IRating
  */
-export type IRating = IStepper
+export type IRating = IStepper;

package/src/control/editor/islider.ts

@@ -6,4 +6,4 @@ import { IStepper } from './istepper';
  * @export
  * @interface ISlider
  */
-export type ISlider = IStepper
+export type ISlider = IStepper;

package/src/control/editor/itext-area.ts

@@ -6,4 +6,4 @@ import { ITextEditor } from './itext-editor';
  * @export
  * @interface ITextArea
  */
-export type ITextArea = ITextEditor
+export type ITextArea = ITextEditor;

package/src/control/expbar/icalendar-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface ICalendarExpBar
  */
-export type ICalendarExpBar = IExpBar
+export type ICalendarExpBar = IExpBar;

package/src/control/expbar/ichart-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IChartExpBar
  */
-export type IChartExpBar = IExpBar
+export type IChartExpBar = IExpBar;

package/src/control/expbar/idata-view-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IDataViewExpBar
  */
-export type IDataViewExpBar = IExpBar
+export type IDataViewExpBar = IExpBar;

package/src/control/expbar/igantt-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IGanttExpBar
  */
-export type IGanttExpBar = IExpBar
+export type IGanttExpBar = IExpBar;

package/src/control/expbar/igrid-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IGridExpBar
  */
-export type IGridExpBar = IExpBar
+export type IGridExpBar = IExpBar;

package/src/control/expbar/ilist-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IListExpBar
  */
-export type IListExpBar = IExpBar
+export type IListExpBar = IExpBar;

package/src/control/expbar/imap-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IMapExpBar
  */
-export type IMapExpBar = IExpBar
+export type IMapExpBar = IExpBar;

package/src/control/expbar/itab-exp-panel.ts

@@ -18,10 +18,22 @@ export interface ITabExpPanel extends IControl, IControlContainer {
 
   /**
    * 导航面板布局
-   * @type {string}
+   * @description 值模式 [分页视图分页栏位置] {TOP：上方（默认）、 TOP_EMBEDDED：上方（嵌入）、 LEFT：左侧、 BOTTOM：下方、 RIGHT：右侧、 FLOW：流布局、 FLOW_NOHEADER：流布局（无标题）、 NOHAEDER：无分页栏、 USER：用户自定义、 USER2：用户自定义2 }
+   * @type {( string | 'TOP' | 'TOP_EMBEDDED' | 'LEFT' | 'BOTTOM' | 'RIGHT' | 'FLOW' | 'FLOW_NOHEADER' | 'NOHAEDER' | 'USER' | 'USER2')}
    * 来源  getTabLayout
    */
-  tabLayout?: string;
+  tabLayout?:
+    | string
+    | 'TOP'
+    | 'TOP_EMBEDDED'
+    | 'LEFT'
+    | 'BOTTOM'
+    | 'RIGHT'
+    | 'FLOW'
+    | 'FLOW_NOHEADER'
+    | 'NOHAEDER'
+    | 'USER'
+    | 'USER2';
 
   /**
    * 全局唯一标记

package/src/control/expbar/itree-exp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface ITreeExpBar
  */
-export type ITreeExpBar = IExpBar
+export type ITreeExpBar = IExpBar;

package/src/control/expbar/iwfexp-bar.ts

@@ -6,4 +6,4 @@ import { IExpBar } from './iexp-bar';
  * @export
  * @interface IWFExpBar
  */
-export type IWFExpBar = IExpBar
+export type IWFExpBar = IExpBar;

package/src/control/form/ideedit-form-item.ts

@@ -5,4 +5,4 @@ import { IDEFormItem } from './ideform-item';
  * @export
  * @interface IDEEditFormItem
  */
-export type IDEEditFormItem = IDEFormItem
+export type IDEEditFormItem = IDEFormItem;

package/src/control/form/idefdcat-group-logic.ts

@@ -6,6 +6,22 @@ import { IDEFDGroupLogic } from './idefdgroup-logic';
  * @interface IDEFDCatGroupLogic
  */
 export interface IDEFDCatGroupLogic extends IDEFDGroupLogic {
+  /**
+   * 逻辑类别
+   * @description 值模式 [表单成员逻辑类型] {PANELVISIBLE：面板显示、 ITEMENABLE：表单项启用、 ITEMBLANK：表单项空输入、 SCRIPTCODE_CHANGE：表单项值变更（脚本处理）、 SCRIPTCODE_CLICK：表单项点击（脚本处理）、 SCRIPTCODE_FOCUS：表单项获取焦点（脚本处理）、 SCRIPTCODE_BLUR：表单项失去焦点（脚本处理） }
+   * @type {( string | 'PANELVISIBLE' | 'ITEMENABLE' | 'ITEMBLANK' | 'SCRIPTCODE_CHANGE' | 'SCRIPTCODE_CLICK' | 'SCRIPTCODE_FOCUS' | 'SCRIPTCODE_BLUR')}
+   * 来源  getLogicCat
+   */
+  logicCat?:
+    | string
+    | 'PANELVISIBLE'
+    | 'ITEMENABLE'
+    | 'ITEMBLANK'
+    | 'SCRIPTCODE_CHANGE'
+    | 'SCRIPTCODE_CLICK'
+    | 'SCRIPTCODE_FOCUS'
+    | 'SCRIPTCODE_BLUR';
+
   /**
    * 关联成员名称集合
    *

package/src/control/form/idefiupdate-detail.ts

@@ -5,11 +5,4 @@ import { IModelObject } from '../../imodel-object';
  * @export
  * @interface IDEFIUpdateDetail
  */
-export interface IDEFIUpdateDetail extends IModelObject {
-  /**
-   * 更新表单项
-   * @type {string}
-   * 来源  getName
-   */
-  name?: string;
-}
+export type IDEFIUpdateDetail = IModelObject;

package/src/control/form/ideform-data-item.ts

@@ -5,4 +5,4 @@ import { IDataItem } from '../../data/idata-item';
  * @export
  * @interface IDEFormDataItem
  */
-export type IDEFormDataItem = IDataItem
+export type IDEFormDataItem = IDataItem;

package/src/control/form/ideform-detail.ts

@@ -1,10 +1,10 @@
+import { IControlItem } from '../icontrol-item';
 import { IDEFDCatGroupLogic } from './idefdcat-group-logic';
 import { ILayout } from '../layout/ilayout';
 import { ILayoutPos } from '../layout/ilayout-pos';
 import { ILanguageRes } from '../../res/ilanguage-res';
 import { ISysCss } from '../../res/isys-css';
 import { ISysImage } from '../../res/isys-image';
-import { IModelObject } from '../../imodel-object';
 
 /**
  *
@@ -12,7 +12,7 @@ import { IModelObject } from '../../imodel-object';
  * @export
  * @interface IDEFormDetail
  */
-export interface IDEFormDetail extends IModelObject {
+export interface IDEFormDetail extends IControlItem {
   /**
    * 标题语言资源
    *
@@ -59,6 +59,13 @@ export interface IDEFormDetail extends IModelObject {
    */
   contentWidth?: number;
 
+  /**
+   * 成员直接样式
+   * @type {string}
+   * 来源  getCssStyle
+   */
+  cssStyle?: string;
+
   /**
    * 成员样式
    * @description 值模式 [部件成员样式] {DEFAULT：默认样式、 STYLE2：样式2、 STYLE3：样式3、 STYLE4：样式4 }

package/src/control/form/idesearch-form-item.ts

@@ -5,4 +5,4 @@ import { IDEFormItem } from './ideform-item';
  * @export
  * @interface IDESearchFormItem
  */
-export type IDESearchFormItem = IDEFormItem
+export type IDESearchFormItem = IDEFormItem;

package/src/control/grid/idegeiupdate-detail.ts

@@ -5,11 +5,4 @@ import { IModelObject } from '../../imodel-object';
  * @export
  * @interface IDEGEIUpdateDetail
  */
-export interface IDEGEIUpdateDetail extends IModelObject {
-  /**
-   * 更新表格列
-   * @type {string}
-   * 来源  getName
-   */
-  name?: string;
-}
+export type IDEGEIUpdateDetail = IModelObject;

package/src/control/grid/idegrid-column.ts

@@ -1,7 +1,7 @@
+import { IControlItem } from '../icontrol-item';
 import { ILanguageRes } from '../../res/ilanguage-res';
 import { ISysCss } from '../../res/isys-css';
 import { ISysImage } from '../../res/isys-image';
-import { IModelObject } from '../../imodel-object';
 
 /**
  *
@@ -9,7 +9,7 @@ import { IModelObject } from '../../imodel-object';
  * @export
  * @interface IDEGridColumn
  */
-export interface IDEGridColumn extends IModelObject {
+export interface IDEGridColumn extends IControlItem {
   /**
    * 聚合值存储属性
    * @type {string}

package/src/control/grid/idetree-grid-field-column.ts

@@ -5,4 +5,4 @@ import { IDEGridFieldColumn } from './idegrid-field-column';
  * @export
  * @interface IDETreeGridFieldColumn
  */
-export type IDETreeGridFieldColumn = IDEGridFieldColumn
+export type IDETreeGridFieldColumn = IDEGridFieldColumn;

package/src/control/grid/idetree-grid.ts

@@ -6,4 +6,4 @@ import { IDEGrid } from './idegrid';
  * @export
  * @interface IDETreeGrid
  */
-export type IDETreeGrid = IDEGrid
+export type IDETreeGrid = IDEGrid;

package/src/control/icontrol-attribute.ts

@@ -0,0 +1,22 @@
+import { IModelObject } from '../imodel-object';
+
+/**
+ *
+ * @export
+ * @interface IControlAttribute
+ */
+export interface IControlAttribute extends IModelObject {
+  /**
+   * 注入属性名称
+   * @type {string}
+   * 来源  getAttrName
+   */
+  attrName?: string;
+
+  /**
+   * 注入属性值
+   * @type {string}
+   * 来源  getAttrValue
+   */
+  attrValue?: string;
+}

package/src/control/icontrol-item-navigatable.ts

@@ -0,0 +1,11 @@
+import { IControlItem } from './icontrol-item';
+import { IControlObjectNavigatable } from './icontrol-object-navigatable';
+
+/**
+ *
+ * @export
+ * @interface IControlItemNavigatable
+ */
+export interface IControlItemNavigatable
+  extends IControlItem,
+    IControlObjectNavigatable {}

package/src/control/icontrol-item.ts

@@ -0,0 +1,35 @@
+import { IControlAttribute } from './icontrol-attribute';
+import { IControlLogic } from './icontrol-logic';
+import { IControlRender } from './icontrol-render';
+import { IModelObject } from '../imodel-object';
+
+/**
+ *
+ * @export
+ * @interface IControlItem
+ */
+export interface IControlItem extends IModelObject {
+  /**
+   * 部件注入属性集合
+   *
+   * @type {IControlAttribute[]}
+   * 来源  getPSControlAttributes
+   */
+  controlAttributes?: IControlAttribute[];
+
+  /**
+   * 部件逻辑集合
+   *
+   * @type {IControlLogic[]}
+   * 来源  getPSControlLogics
+   */
+  controlLogics?: IControlLogic[];
+
+  /**
+   * 部件绘制器集合
+   *
+   * @type {IControlRender[]}
+   * 来源  getPSControlRenders
+   */
+  controlRenders?: IControlRender[];
+}

package/src/control/icontrol-logic.ts

@@ -67,13 +67,6 @@ export interface IControlLogic extends IModelObject {
     | 'DEUIACTION'
     | 'SYSVIEWLOGIC';
 
-  /**
-   * 逻辑名称
-   * @type {string}
-   * 来源  getName
-   */
-  name?: string;
-
   /**
    * 触发应用实体界面行为
    *

package/src/control/icontrol-nav-context.ts

@@ -5,4 +5,4 @@ import { INavigateContext } from './inavigate-context';
  * @export
  * @interface IControlNavContext
  */
-export type IControlNavContext = INavigateContext
+export type IControlNavContext = INavigateContext;

package/src/control/icontrol-nav-param.ts

@@ -5,4 +5,4 @@ import { INavigateParam } from './inavigate-param';
  * @export
  * @interface IControlNavParam
  */
-export type IControlNavParam = INavigateParam
+export type IControlNavParam = INavigateParam;

package/src/control/icontrol-object-navigatable.ts

@@ -5,4 +5,4 @@ import { INavigatable } from './inavigatable';
  * @export
  * @interface IControlObjectNavigatable
  */
-export type IControlObjectNavigatable = INavigatable
+export type IControlObjectNavigatable = INavigatable;

package/src/control/icontrol-render.ts

@@ -0,0 +1,30 @@
+import { IModelObject } from '../imodel-object';
+
+/**
+ *
+ * @export
+ * @interface IControlRender
+ */
+export interface IControlRender extends IModelObject {
+  /**
+   * 布局面板模型
+   * @type {string}
+   * 来源  getLayoutPanelModel
+   */
+  layoutPanelModel?: string;
+
+  /**
+   * 绘制器名称
+   * @type {string}
+   * 来源  getRenderName
+   */
+  renderName?: string;
+
+  /**
+   * 绘制器类型
+   * @description 值模式 [部件绘制器类型] {LAYOUTPANEL：布局面板、 LAYOUTPANEL_MODEL：布局面板（模型）、 PFPLUGIN：前端插件 }
+   * @type {( string | 'LAYOUTPANEL' | 'LAYOUTPANEL_MODEL' | 'PFPLUGIN')}
+   * 来源  getRenderType
+   */
+  renderType?: string | 'LAYOUTPANEL' | 'LAYOUTPANEL_MODEL' | 'PFPLUGIN';
+}

package/src/control/icontrol.ts

@@ -1,6 +1,8 @@
 import { IControlAction } from './icontrol-action';
+import { IControlAttribute } from './icontrol-attribute';
 import { IControlLogic } from './icontrol-logic';
 import { IControlParam } from './icontrol-param';
+import { IControlRender } from './icontrol-render';
 import { ICtrlMsg } from '../res/ictrl-msg';
 import { ISysCss } from '../res/isys-css';
 import { IModelObject } from '../imodel-object';
@@ -98,6 +100,14 @@ export interface IControl extends IModelObject {
    */
   appDataEntityId?: string;
 
+  /**
+   * 部件注入属性集合
+   *
+   * @type {IControlAttribute[]}
+   * 来源  getPSControlAttributes
+   */
+  controlAttributes?: IControlAttribute[];
+
   /**
    * 部件逻辑集合
    *
@@ -114,6 +124,14 @@ export interface IControl extends IModelObject {
    */
   controlParam?: IControlParam;
 
+  /**
+   * 部件绘制器集合
+   *
+   * @type {IControlRender[]}
+   * 来源  getPSControlRenders
+   */
+  controlRenders?: IControlRender[];
+
   /**
    * 部件消息
    *

package/src/control/imdcontrol2.ts

@@ -5,4 +5,4 @@ import { IMDControl } from './imdcontrol';
  * @export
  * @interface IMDControl2
  */
-export type IMDControl2 = IMDControl
+export type IMDControl2 = IMDControl;

package/src/control/inavigate-context.ts

@@ -5,4 +5,4 @@ import { INavigateParam } from './inavigate-param';
  * @export
  * @interface INavigateContext
  */
-export type INavigateContext = INavigateParam
+export type INavigateContext = INavigateParam;

package/src/control/iraw-item-base.ts

@@ -68,4 +68,12 @@ export interface IRawItemBase extends IModelObject {
    * 来源  getRawItemWidth
    */
   rawItemWidth?: number;
+
+  /**
+   * 模板模式
+   * @type {boolean}
+   * @default false
+   * 来源  isTemplateMode
+   */
+  templateMode?: boolean;
 }

package/src/control/iraw-item-param.ts

@@ -5,4 +5,4 @@ import { IControlItemParam } from './icontrol-item-param';
  * @export
  * @interface IRawItemParam
  */
-export type IRawItemParam = IControlItemParam
+export type IRawItemParam = IControlItemParam;

package/src/control/layout/iabsolute-layout.ts

@@ -6,4 +6,4 @@ import { ILayout } from './ilayout';
  * @export
  * @interface IAbsoluteLayout
  */
-export type IAbsoluteLayout = ILayout
+export type IAbsoluteLayout = ILayout;

package/src/control/layout/iborder-layout.ts

@@ -6,4 +6,4 @@ import { ILayout } from './ilayout';
  * @export
  * @interface IBorderLayout
  */
-export type IBorderLayout = ILayout
+export type IBorderLayout = ILayout;

package/src/control/layout/itable-layout-pos.ts

@@ -6,4 +6,4 @@ import { ILayoutPos } from './ilayout-pos';
  * @export
  * @interface ITableLayoutPos
  */
-export type ITableLayoutPos = ILayoutPos
+export type ITableLayoutPos = ILayoutPos;

package/src/control/layout/itable-layout.ts

@@ -6,4 +6,4 @@ import { ILayout } from './ilayout';
  * @export
  * @interface ITableLayout
  */
-export type ITableLayout = ILayout
+export type ITableLayout = ILayout;

package/src/control/list/ilist-item.ts

@@ -1,12 +1,12 @@
+import { IControlItem } from '../icontrol-item';
 import { ILanguageRes } from '../../res/ilanguage-res';
-import { IModelObject } from '../../imodel-object';
 
 /**
  *
  * @export
  * @interface IListItem
  */
-export interface IListItem extends IModelObject {
+export interface IListItem extends IControlItem {
   /**
    * 对齐方式
    * @description 值模式 [云实体属性界面模式表格列对齐] {LEFT：左对齐、 CENTER：居中、 RIGHT：右对齐 }

package/src/control/map/imap-item.ts

@@ -1,3 +1,4 @@
+import { IControlItem } from '../icontrol-item';
 import { IControlMDataContainer } from '../icontrol-mdata-container';
 import { IControlObjectNavigatable } from '../icontrol-object-navigatable';
 import { IControlXDataContainer } from '../icontrol-xdata-container';
@@ -12,7 +13,8 @@ import { ISysImage } from '../../res/isys-image';
  * @interface IMapItem
  */
 export interface IMapItem
-  extends IControlXDataContainer,
+  extends IControlItem,
+    IControlXDataContainer,
     IControlMDataContainer,
     IControlObjectNavigatable {
   /**