@ibiz-template/runtime 0.7.41-alpha.9 → 0.7.41-alpha.91

package/out/controller/control/list/list.controller.js

@@ -1,11 +1,42 @@
 import { createUUID, isBoolean } from 'qx-util';
-import { clone, isNil } from 'ramda';
-import { isElementSame } from '@ibiz-template/core';
+import { isNil } from 'ramda';
+import { clone, DataTypes, isElementSame, RuntimeModelError, } from '@ibiz-template/core';
+import dayjs from 'dayjs';
 import { MDControlController } from '../../common';
 import { ListService } from './list.service';
-import { formatDate, ButtonContainerState, UIActionButtonState, } from '../../utils';
+import { UIActionButtonState, ButtonContainerState } from '../../utils';
 import { UIActionUtil } from '../../../ui-action';
+import { calcDeCodeNameById, calcUIActionGroup, getAllUIActionItems, getParentTextAppDEFieldId, } from '../../../model';
+import { ControlVO } from '../../../service';
+import { formatDateByScale } from '../../../utils';
 export class ListController extends MDControlController {
+    /**
+     * @description 是否允许新建
+     * @readonly
+     * @type {boolean}
+     * @memberof ListController
+     */
+    get enableNew() {
+        return this.model.enableRowNew === true;
+    }
+    /**
+     * @description 是否允许调整顺序
+     * @readonly
+     * @type {boolean}
+     * @memberof ListController
+     */
+    get enableEditOrder() {
+        return this.model.enableRowEditOrder === true;
+    }
+    /**
+     * @description 是否支持调整分组
+     * @readonly
+     * @type {boolean}
+     * @memberof ListController
+     */
+    get enableEditGroup() {
+        return this.model.enableRowEditGroup === true;
+    }
     initState() {
         super.initState();
         this.state.noSort = this.model.noSort === true;
@@ -13,6 +44,9 @@ export class ListController extends MDControlController {
         this.state.expandedKeys = [];
         const { enablePagingBar } = this.model;
         this.state.enablePagingBar = enablePagingBar;
+        this.state.uaState = {};
+        this.state.readonly = !!(this.context.srfreadonly === true || this.context.srfreadonly === 'true');
+        this.state.draggable = this.enableEditOrder || this.enableEditGroup;
     }
     async onCreated() {
         await super.onCreated();
@@ -20,6 +54,29 @@ export class ListController extends MDControlController {
         this.service = new ListService(this.model);
         await this.service.init(this.context);
     }
+    /**
+     * @description 初始化界面行为组
+     * @protected
+     * @memberof ListController
+     */
+    async initUIActions() {
+        var _a;
+        // 收集所有遍历过程中的异步任务
+        const asyncTasks = [];
+        // 分组界面行为组
+        if (this.model.groupUIActionGroup) {
+            const task = calcUIActionGroup(this.model.groupUIActionGroup, this.context, this.params);
+            asyncTasks.push(task);
+        }
+        // 操作项界面行为组
+        (_a = this.model.delistItems) === null || _a === void 0 ? void 0 : _a.forEach(item => {
+            if (item.itemType === 'ACTIONITEM' && item.deuiactionGroup) {
+                const task = calcUIActionGroup(item.deuiactionGroup, this.context, this.params);
+                asyncTasks.push(task);
+            }
+        });
+        await Promise.all(asyncTasks);
+    }
     /**
      * @description 初始化分组界面行为组
      * @return {*}  {Promise<void>}
@@ -28,12 +85,12 @@ export class ListController extends MDControlController {
     async initGroupActionStates() {
         var _a;
         const { groupUIActionGroup } = this.model;
-        if (!((_a = groupUIActionGroup === null || groupUIActionGroup === void 0 ? void 0 : groupUIActionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+        if (!((_a = groupUIActionGroup === null || groupUIActionGroup === void 0 ? void 0 : groupUIActionGroup.uiactionGroupDetails) === null || _a === void 0 ? void 0 : _a.length))
             return;
-        }
         this.state.groups.forEach(async (group) => {
             const containerState = new ButtonContainerState();
-            groupUIActionGroup.uiactionGroupDetails.forEach(detail => {
+            const actions = getAllUIActionItems(groupUIActionGroup.uiactionGroupDetails);
+            actions.forEach(detail => {
                 const actionid = detail.uiactionId;
                 if (actionid) {
                     const buttonState = new UIActionButtonState(detail.id, this.context.srfappid, actionid, detail);
@@ -131,11 +188,74 @@ export class ListController extends MDControlController {
         });
     }
     async afterLoad(args, items) {
+        super.afterLoad(args, items);
+        // 每次加载回来先本地排序，把数据的排序属性规范一下
+        this.sortItems(this.state.items);
         await this.handleDataGroup();
         await this.initGroupActionStates();
+        await this.calcOptItemState(items);
         this.calcShowMode(items);
         return items;
     }
+    /**
+     * @description 获取操作项行为集合模型
+     * @returns {*}  {IUIActionGroupDetail[]}
+     * @memberof ListController
+     */
+    getOptItemModel() {
+        const actions = [];
+        const { delistItems } = this.model;
+        delistItems === null || delistItems === void 0 ? void 0 : delistItems.forEach(item => {
+            if (item.itemType === 'ACTIONITEM' &&
+                item.deuiactionGroup &&
+                item.deuiactionGroup.uiactionGroupDetails) {
+                actions.push(...item.deuiactionGroup.uiactionGroupDetails);
+            }
+        });
+        return actions;
+    }
+    /**
+     * @description 计算操作项状态
+     * @param {IData[]} items
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async calcOptItemState(items) {
+        const details = this.getOptItemModel();
+        if (details.length)
+            await Promise.all(items.map(async (item) => {
+                const containerState = new ButtonContainerState();
+                const actions = getAllUIActionItems(details);
+                actions.forEach(action => {
+                    const actionid = action.uiactionId;
+                    if (actionid) {
+                        const buttonState = new UIActionButtonState(action.id, this.context.srfappid, actionid);
+                        containerState.addState(action.id, buttonState);
+                    }
+                });
+                await containerState.update(this.context, item.getOrigin(), this.model.appDataEntityId);
+                this.state.uaState[item.srfkey] = containerState;
+            }));
+    }
+    /**
+     * @description 行为点击
+     * @param {IUIActionGroupDetail} detail
+     * @param {IData} item
+     * @param {MouseEvent} event
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async onActionClick(detail, item, event) {
+        const actionId = detail.uiactionId;
+        await UIActionUtil.execAndResolved(actionId, {
+            context: this.context,
+            params: this.params,
+            data: [item],
+            view: this.view,
+            ctrl: this,
+            event,
+        }, detail.appId);
+    }
     /**
      * 设置列表数据
      *
@@ -146,6 +266,8 @@ export class ListController extends MDControlController {
      */
     setData(items) {
         this.state.items = items;
+        // 将已选中的数据过滤下
+        this.state.selectedData = this.state.selectedData.filter(selected => items.some(item => item.srfkey === selected.srfkey));
     }
     /**
      * 获取列表数据
@@ -191,7 +313,7 @@ export class ListController extends MDControlController {
     /**
      * 处理数据分组
      *
-     * @memberof DataViewControlController
+     * @memberof ListController
      */
     async handleDataGroup() {
         const { groupMode } = this.model;
@@ -211,10 +333,9 @@ export class ListController extends MDControlController {
     /**
      * 处理自动分组
      *
-     * @memberof DataViewControlController
+     * @memberof ListController
      */
     async handleAutoGroup() {
-        var _a;
         const { groupAppDEFieldId, groupCodeListId } = this.model;
         // 自动分组且存在代码表时，使用代码表做一次转换
         let codeList = [];
@@ -224,10 +345,8 @@ export class ListController extends MDControlController {
         }
         if (groupAppDEFieldId) {
             const { items } = this.state;
-            // 判断分组属性是否为外键值
-            const deRss = (_a = this.dataEntity.minorAppDERSs) === null || _a === void 0 ? void 0 : _a.find(rss => rss.parentAppDEFieldId === groupAppDEFieldId);
-            // 获取外键值文本属性
-            const textDEFieldId = deRss === null || deRss === void 0 ? void 0 : deRss.parentTextAppDEFieldId;
+            const textDEFieldId = getParentTextAppDEFieldId(groupAppDEFieldId, this.dataEntity) ||
+                groupAppDEFieldId;
             const dateFormat = this.groupDateFormat[0];
             const groupMap = new Map();
             const unclassified = {
@@ -236,11 +355,17 @@ export class ListController extends MDControlController {
                 children: [],
             };
             items.forEach((item) => {
-                // 如果有外键值文本属性，则根据外键值文本属性分组
-                let groupVal = item[textDEFieldId || groupAppDEFieldId];
+                let groupVal = item[textDEFieldId];
                 // 特殊处理日期格式化
                 if (dateFormat)
-                    groupVal = formatDate(groupVal, dateFormat);
+                    groupVal = formatDateByScale(groupVal, dateFormat);
+                // 当分组样式为 STYLE2 且 groupVal 是有效的日期时，默认以天为单位格式化分组值
+                if (this.model.groupStyle === 'STYLE2' && dayjs(groupVal).isValid()) {
+                    groupVal = formatDateByScale(groupVal, 'day');
+                    // 如果分组标题时间与当前时间相同，则以 今天 显示分组标题
+                    if (dayjs(groupVal).isSame(dayjs(), 'day'))
+                        groupVal = ibiz.i18n.t(`runtime.controller.common.md.today`);
+                }
                 // 分组无值默认归为未分类
                 if (isNil(groupVal)) {
                     unclassified.children.push(item);
@@ -268,7 +393,7 @@ export class ListController extends MDControlController {
     /**
      * 处理代码表分组
      *
-     * @memberof DataViewControlController
+     * @memberof ListController
      */
     async handleCodeListGroup() {
         const { groupAppDEFieldId, groupCodeListId } = this.model;
@@ -299,8 +424,8 @@ export class ListController extends MDControlController {
         }
     }
     /**
-     * @description 切换分组折叠
-     * @param {IData} [params={}]
+     * @description 切换折叠，tag=指定分组标识(不传则全部)，expand=目标状态(不传则反转)
+     * @param {{ tag?: string; expand?: boolean }} [params={}]
      * @memberof ListController
      */
     changeCollapse(params = {}) {
@@ -323,4 +448,299 @@ export class ListController extends MDControlController {
             this.state.expandedKeys = [];
         }
     }
+    /**
+     * @description 点击新建
+     * @param {MouseEvent} event
+     * @param {(string | number)} [group]
+     * @memberof ListController
+     */
+    onClickNew(event, group) {
+        const params = Object.assign({}, this.params);
+        if (group)
+            Object.assign(params, { srfgroup: group });
+        UIActionUtil.execAndResolved('new', {
+            context: this.context,
+            params,
+            data: [],
+            view: this.view,
+            ctrl: this,
+            event,
+        }, this.view.model.appId);
+    }
+    /**
+     * @description 本地排序items(用于拖拽数据完成后的前端数据排序)
+     * @param {IData[]} items
+     * @returns {*}  {void}
+     * @memberof ListController
+     */
+    sortItems(items) {
+        var _a, _b;
+        const { minorSortAppDEFieldId, minorSortDir } = this.model;
+        if (!minorSortAppDEFieldId || !minorSortDir)
+            return;
+        const sortField = (_b = (_a = this.dataEntity) === null || _a === void 0 ? void 0 : _a.appDEFields) === null || _b === void 0 ? void 0 : _b.find(_item => _item.codeName === minorSortAppDEFieldId);
+        if (!sortField || !DataTypes.isNumber(sortField.stdDataType)) {
+            ibiz.log.warn(ibiz.i18n.t('runtime.controller.common.md.invalidSortType'));
+            return;
+        }
+        const isAsc = minorSortDir === 'ASC';
+        // 格式化排序属性的值
+        items.forEach(item => {
+            const sortValue = item[minorSortAppDEFieldId];
+            if (isNil(sortValue))
+                item[minorSortAppDEFieldId] = 0;
+        });
+        // 排序
+        items.sort((a, b) => isAsc
+            ? a[minorSortAppDEFieldId] - b[minorSortAppDEFieldId]
+            : b[minorSortAppDEFieldId] - a[minorSortAppDEFieldId]);
+    }
+    /**
+     * @description 计算移动数据参数
+     * @protected
+     * @param {number} fromIndex 变更前的索引位置
+     * @param {number} toIndex 变更后的索引位置
+     * @param {IData} draggedItem 拖拽数据项
+     * @param {IData[]} targetArray 数据集
+     * @param {boolean} isCrossGroup 是否切换分组
+     * @returns {*}  {IData}
+     * @memberof ListController
+     */
+    computeMoveDataParam(fromIndex, toIndex, draggedItem, targetArray, isCrossGroup) {
+        let moveData = {};
+        const { minorSortAppDEFieldId } = this.model;
+        if (!minorSortAppDEFieldId)
+            return moveData;
+        const targetItem = targetArray[toIndex];
+        if (!targetItem) {
+            let tempArray = [];
+            if (targetArray.length > 0) {
+                tempArray = targetArray;
+            }
+            if (tempArray.length > 0) {
+                const maxItem = tempArray.reduce((prev, curr) => {
+                    const sortCondition = prev[minorSortAppDEFieldId] > curr[minorSortAppDEFieldId];
+                    if (sortCondition &&
+                        prev[this.dataEntity.keyAppDEFieldId] !== draggedItem.srfkey) {
+                        return prev;
+                    }
+                    if (!sortCondition &&
+                        curr[this.dataEntity.keyAppDEFieldId] !== draggedItem.srfkey) {
+                        return curr;
+                    }
+                    return prev;
+                });
+                if (maxItem &&
+                    maxItem[this.dataEntity.keyAppDEFieldId] !== draggedItem.srfkey) {
+                    moveData = {
+                        srftargetkey: maxItem.srfkey,
+                        srfmovetype: 'MOVEAFTER',
+                    };
+                }
+            }
+        }
+        else {
+            moveData = {
+                srftargetkey: targetItem.srfkey,
+                srfmovetype: toIndex < targetArray.length - 1
+                    ? 'MOVEBEFORE'
+                    : isCrossGroup
+                        ? 'MOVEBEFORE'
+                        : 'MOVEAFTER',
+            };
+        }
+        return moveData;
+    }
+    /**
+     * @description 移动并排序数据
+     * @param {ControlVO} draggedItem
+     * @param {IData} moveMeta
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async moveOrderItem(draggedItem, moveMeta) {
+        try {
+            this.state.updating = true;
+            const { minorSortAppDEFieldId } = this.model;
+            if (!minorSortAppDEFieldId)
+                return ibiz.log.error(ibiz.i18n.t('runtime.controller.common.md.sortingProperties'));
+            const deName = calcDeCodeNameById(this.model.appDataEntityId);
+            const tempContext = this.context.clone();
+            tempContext[deName] = draggedItem.srfkey;
+            if (!moveMeta.srftargetkey || !moveMeta.srfmovetype)
+                return ibiz.log.error(ibiz.i18n.t('runtime.controller.common.md.computeMoveMetaError'));
+            const res = await this.service.moveOrderItem(tempContext, draggedItem, moveMeta);
+            if (res.ok) {
+                // 通知实体数据变更
+                this.emitDEDataChange('update', res.data);
+                res.data.forEach(_item => {
+                    const item = this.state.items.find(x => x.srfkey === _item.srfkey);
+                    if (item)
+                        item[minorSortAppDEFieldId] = _item[minorSortAppDEFieldId];
+                });
+                await this.afterLoad({}, this.state.items);
+            }
+        }
+        finally {
+            this.state.updating = false;
+        }
+    }
+    /**
+     * @description 批量更新修改项
+     * @param {ControlVO[]} changedItems
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async updateChangedItems(changedItems) {
+        try {
+            this.state.updating = true;
+            await Promise.all(changedItems.map(async (item) => {
+                // 往上下文添加主键
+                const deName = calcDeCodeNameById(this.model.appDataEntityId);
+                const tempContext = this.context.clone();
+                tempContext[deName] = item.srfkey;
+                // 调用接口修改数据
+                const res = await this.service.update(tempContext, item);
+                // 更新完之后更新state里的数据。
+                if (res.ok) {
+                    // 通知实体数据变更
+                    this.emitDEDataChange('update', res.data);
+                    const index = this.state.items.findIndex(x => x.srfkey === item.srfkey);
+                    this.state.items.splice(index, 1, res.data);
+                }
+            }));
+        }
+        finally {
+            this.state.updating = false;
+            await this.afterLoad({}, this.state.items);
+        }
+    }
+    /**
+     * @description 拖拽变更
+     * @param {IDragChangeInfo} info
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async onDragChange(info) {
+        const { from, to, fromIndex, toIndex } = info;
+        if (!this.enableEditGroup && from !== to)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.adjustmentsGroup'));
+        if (!this.enableEditOrder && from === to)
+            return ibiz.message.warning(ibiz.i18n.t('runtime.controller.common.md.noAllowReorder'));
+        const { groupAppDEFieldId, moveControlAction, minorSortAppDEFieldId } = this.model;
+        const fromGroup = this.state.groups.find(x => x.key === from);
+        const toGroup = this.state.groups.find(x => x.key === to);
+        const draggedItem = clone((fromGroup === null || fromGroup === void 0 ? void 0 : fromGroup.children[fromIndex]) || this.state.items[fromIndex]);
+        // 分组变更
+        if (from !== to && groupAppDEFieldId)
+            draggedItem[groupAppDEFieldId] = to;
+        // 仅变更分组
+        if (!this.enableEditOrder) {
+            await this.updateChangedItems([draggedItem]);
+        }
+        else {
+            // 排序变更
+            if (!minorSortAppDEFieldId)
+                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.sortingProperties'));
+            const moveAction = moveControlAction === null || moveControlAction === void 0 ? void 0 : moveControlAction.appDEMethodId;
+            if (!moveAction)
+                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
+            // 存在移动数据行为，先变更分组再变更排序
+            if (from !== to) {
+                await this.updateChangedItems([draggedItem]);
+            }
+            const originArr = (toGroup === null || toGroup === void 0 ? void 0 : toGroup.children) || this.state.items;
+            const params = this.computeMoveDataParam(fromIndex, toIndex, draggedItem, originArr, info.from !== info.to);
+            await this.moveOrderItem(draggedItem, params);
+        }
+    }
+    /**
+     * @description 新建行
+     * @param {MDCtrlLoadParams} [args={}]
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async newRow(args = {}) {
+        try {
+            const res = await this.service.getDraft(this.context, this.params);
+            if (res.ok && res.data) {
+                // 加载完后续处理
+                this.state.items.unshift(res.data);
+                await this.afterLoad(args, this.state.items);
+                this.actionNotification('GETDRAFTSUCCESS', { data: res.data });
+            }
+        }
+        catch (error) {
+            this.actionNotification('GETDRAFTERROR', {
+                error: error,
+            });
+            throw error;
+        }
+    }
+    /**
+     * @description 行单击
+     * @param {IData} _data
+     * @returns {*}  {Promise<void>}
+     * @memberof ListController
+     */
+    async onRowClick(_data) {
+        var _a;
+        const data = this.state.items.find(item => item.srfkey === _data.srfkey);
+        if (!data)
+            return;
+        super.onRowClick(data);
+        const { groupAppDEFieldId } = this.model;
+        if (groupAppDEFieldId) {
+            // 根据selectedData填充分组的选中数据
+            this.state.groups.forEach(group => {
+                group.selectedData = [];
+            });
+            this.state.selectedData.forEach(select => {
+                const groupVal = select[groupAppDEFieldId];
+                const selectGroup = this.state.groups.find(group => group.key === groupVal);
+                if (selectGroup) {
+                    selectGroup.selectedData.push(select);
+                }
+            });
+            // 根据分组选中的数据更新分组的按钮状态
+            if (this.state.singleSelect) {
+                // 单选情况下只有点击的分组的按钮会激活
+                this.state.groups.forEach(group => {
+                    var _a, _b;
+                    let tempData = data;
+                    if (group.selectedData.indexOf(tempData) !== -1) {
+                        if (tempData && tempData instanceof ControlVO) {
+                            tempData = tempData.getOrigin();
+                        }
+                        if (tempData) {
+                            (_a = group.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(this.context, tempData, this.model.appDataEntityId);
+                        }
+                    }
+                    else {
+                        (_b = group.groupActionGroupState) === null || _b === void 0 ? void 0 : _b.update(this.context, undefined, this.model.appDataEntityId);
+                    }
+                });
+            }
+            else {
+                // 多选情况下可能有多组分组按钮会激活
+                const actionGroup = this.state.groups.find(group => {
+                    return group.children.indexOf(data) !== -1;
+                });
+                if (actionGroup) {
+                    (_a = actionGroup.groupActionGroupState) === null || _a === void 0 ? void 0 : _a.update(this.context, actionGroup.selectedData[0], this.model.appDataEntityId);
+                }
+            }
+        }
+    }
+    /**
+     * @description 转换各类多语言
+     * @protected
+     * @memberof ListController
+     */
+    convertMultipleLanguages() {
+        const { emptyTextLanguageRes, emptyText } = this.model;
+        if (emptyTextLanguageRes === null || emptyTextLanguageRes === void 0 ? void 0 : emptyTextLanguageRes.lanResTag) {
+            this.model.emptyText = ibiz.i18n.t(emptyTextLanguageRes.lanResTag, emptyText);
+        }
+    }
 }

package/out/controller/control/list/list.service.d.ts

@@ -1,5 +1,6 @@
 import { IDEList } from '@ibiz/model-core';
-import { MDControlService } from '../../../service';
+import { IHttpResponse } from '@ibiz-template/core';
+import { ControlVO, MDControlService } from '../../../service';
 /**
  * 列表部件服务
  * @author lxm
@@ -9,6 +10,15 @@ import { MDControlService } from '../../../service';
  * @extends {MDControlService<IDEList>}
  */
 export declare class ListService extends MDControlService<IDEList> {
+    /**
+     * @description 移动并排序数据
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @returns {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof ListService
+     */
+    moveOrderItem(context: IContext, data: ControlVO, args: IData): Promise<IHttpResponse<ControlVO[]>>;
     /**
      * 初始化属性映射
      *

package/out/controller/control/list/list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAEhE;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAqBtB"}
+{"version":3,"file":"list.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAc,MAAM,kBAAkB,CAAC;AAE3E;;;;;;;GAOG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;;;OAOG;IACG,aAAa,CACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAWtC;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAqBtB"}

package/out/controller/control/list/list.service.js

@@ -1,3 +1,4 @@
+import { clone } from '@ibiz-template/core';
 import { MDControlService, UIMapField } from '../../../service';
 /**
  * 列表部件服务
@@ -8,6 +9,24 @@ import { MDControlService, UIMapField } from '../../../service';
  * @extends {MDControlService<IDEList>}
  */
 export class ListService extends MDControlService {
+    /**
+     * @description 移动并排序数据
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @param {IData} args
+     * @returns {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     * @memberof ListService
+     */
+    async moveOrderItem(context, data, args) {
+        const moveAction = this.model.moveControlAction.appDEMethodId;
+        const params = clone(data.getOrigin());
+        Object.assign(params, args);
+        let res = await this.exec(moveAction, context, params, {
+            srfupdateitem: true,
+        });
+        res = this.handleResponse(res);
+        return res;
+    }
     /**
      * 初始化属性映射
      *

package/out/controller/control/map/map.controller.d.ts

@@ -47,7 +47,7 @@ export declare class MapController extends MDControlController<ISysMap, IMapStat
      * @date 2023-10-31 05:30:54
      * @param {IMapData} mapData
      */
-    onAreaClick(mapData: IMapData): void;
+    onAreaClick(mapData: IMapData, areaCode: string | number, areaLevel: string): void;
     /**
      * 地图散点点击事件处理
      * @author lxm
@@ -55,5 +55,16 @@ export declare class MapController extends MDControlController<ISysMap, IMapStat
      * @param {IMapData} mapData
      */
     onPointClick(mapData: IMapData): void;
+    /**
+     * @description 下钻
+     * @param {string | number} areaCode
+     * @memberof MapController
+     */
+    drillDown(areaCode: string | number): void;
+    /**
+     * @description 返回
+     * @memberof MapController
+     */
+    back(): void;
 }
 //# sourceMappingURL=map.controller.d.ts.map

package/out/controller/control/map/map.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/map.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,qBAAa,aACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CACzD,YAAW,cAAc;IAEjB,OAAO,EAAE,UAAU,CAAC;IAE5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAuCnD,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBzE;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IAgC1B;;;;;OAKG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAIpC;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAItC"}
+{"version":3,"file":"map.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/map/map.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EACL,QAAQ,EACR,SAAS,EACT,SAAS,EACT,cAAc,EACd,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAGnD,qBAAa,aACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CACzD,YAAW,cAAc;IAEjB,OAAO,EAAE,UAAU,CAAC;IAE5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;OAIG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB,SAAS,CAAC,SAAS,IAAI,IAAI;cAWX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACG,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA6CnD,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAiBzE;;;;OAIG;IACH,kBAAkB,IAAI,IAAI;IA6C1B;;;;;OAKG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAO3D;;;;;OAKG;IACH,WAAW,CACT,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,SAAS,EAAE,MAAM,GAChB,IAAI;IAOP;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAKrC;;;;OAIG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAI1C;;;OAGG;IACH,IAAI,IAAI,IAAI;CAGb"}