ngx-rs-ant 1.2.9 → 1.3.0

package/fesm2020/ngx-rs-ant.mjs

@@ -3,13 +3,13 @@ import { Component, Input, HostBinding, EventEmitter, Output, HostListener, View
 import { PluginFactory } from 'coast-plugin-register';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
-import { Subject, ReplaySubject, Subscription, map, of, lastValueFrom, debounceTime, interval } from 'rxjs';
+import { Subject, ReplaySubject, Subscription, map, shareReplay, lastValueFrom, debounceTime, interval } from 'rxjs';
 import * as i2 from 'devextreme-angular/ui/number-box';
 import * as i2$1 from 'devextreme-angular/ui/draggable';
 import { DevExtremeModule, DxLoadPanelModule, DxDataGridComponent, DxValidationGroupComponent } from 'devextreme-angular';
 import BpmnModeler from 'camunda-bpmn-js/lib/camunda-platform/Modeler';
 import { is } from 'bpmn-js/lib/util/ModelUtil';
-import { TextAreaEntry, isTextAreaEntryEdited, SelectEntry, isSelectEntryEdited } from '@bpmn-io/properties-panel';
+import { TextFieldEntry, isTextFieldEntryEdited } from '@bpmn-io/properties-panel';
 import * as i6 from 'devextreme-angular/ui/load-panel';
 import * as i6$1 from 'devextreme-angular/ui/nested';
 import { DxoPositionModule } from 'devextreme-angular/ui/nested';
@@ -846,40 +846,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
         }] });
 
 const translations = {
-    // 调色板
     'Activate the hand tool': '激活拖拽工具',
     'Activate the lasso tool': '激活框选工具',
     'Activate the create/remove space tool': '激活空间移动工具',
     'Activate the global connect tool': '激活全局连接工具',
     'Create StartEvent': '创建开始节点',
     'Create EndEvent': '创建结束节点',
-    'Create UserTask': '创建用户任务',
-    'Create ServiceTask': '创建服务任务',
     'Create Gateway': '创建网关节点',
-    // 面板
-    'Append EndEvent': '追加结束节点',
-    'Append UserTask': '追加用户任务',
-    'Append ServiceTask': '追加服务任务',
-    'Append Gateway': '追加网关节点',
-    'Connect using Sequence/MessageFlow or Association': '使用序列/消息流或关联连接',
-    'Remove': '删除',
-    'Set Color': '设置颜色',
-    'Change type': '改变节点类型',
-    'Exclusive Gateway': '互斥网关',
-    'Parallel Gateway': '并行网关',
-    'Default Flow': '默认流向',
-    'Sequence Flow': '顺序流向',
+    'Create UserTask': '创建用户任务',
     'Open minimap': '打开缩略图',
     'Close minimap': '关闭缩略图',
-    // 配置
-    'General': '参数配置',
-    'Name': '名称',
-    'Task description': '任务描述',
-    'Set assignment rule': '设置用户规则',
-    'dynamic user': '动态用户',
-    'static user': '静态用户',
-    'dynamic role': '动态角色',
-    'static role': '静态角色',
     /*
       'Create {type}': '创建{type}',
       'Create Intermediate/Boundary Event': '创建中间/边界事件',
@@ -1250,85 +1226,6 @@ var customUserTaskModule = {
     userTaskContextPadProvider: ['type', UserTaskContextPadProvider],
 };
 
-class ServiceTaskPaletteProvider {
-    constructor(palette, translate, elementFactory, create) {
-        this.translate = translate;
-        this.elementFactory = elementFactory;
-        this.create = create;
-        palette.registerProvider(this);
-        this.createServiceTask = this.createServiceTask.bind(this);
-    }
-    getPaletteEntries() {
-        return {
-            'create.service-task': {
-                group: 'activity',
-                className: 'bpmn-icon-service-task',
-                title: this.translate('Create ServiceTask'),
-                action: {
-                    dragstart: this.createServiceTask,
-                    click: this.createServiceTask
-                }
-            }
-        };
-    }
-    createServiceTask(event) {
-        const shape = this.elementFactory.createShape({ type: 'bpmn:ServiceTask' });
-        this.create.start(event, shape);
-    }
-}
-
-class ServiceTaskContextPadProvider {
-    constructor(contextPad, translate, appendPreview, elementFactory, autoPlace, create) {
-        this.translate = translate;
-        this.appendPreview = appendPreview;
-        this.elementFactory = elementFactory;
-        this.autoPlace = autoPlace;
-        this.create = create;
-        contextPad.registerProvider(this);
-        this.appendServiceTaskPreview = this.appendServiceTaskPreview.bind(this);
-        this.appendServiceTask = this.appendServiceTask.bind(this);
-        this.appendServiceTaskStart = this.appendServiceTaskStart.bind(this);
-    }
-    getContextPadEntries() {
-        return {
-            'append.service-task': {
-                group: 'model',
-                className: 'bpmn-icon-service-task',
-                title: this.translate('Append ServiceTask'),
-                action: {
-                    hover: this.appendServiceTaskPreview,
-                    click: this.appendServiceTask,
-                    dragstart: this.appendServiceTaskStart
-                }
-            }
-        };
-    }
-    appendServiceTaskPreview(event, source) {
-        this.appendPreview.create(source, 'bpmn:ServiceTask');
-        return () => {
-            this.appendPreview.cleanUp();
-        };
-    }
-    appendServiceTask(event, source) {
-        const shape = this.elementFactory.createShape({ type: 'bpmn:ServiceTask' });
-        this.autoPlace.append(source, shape);
-        this.appendPreview.cleanUp();
-    }
-    appendServiceTaskStart(event, source) {
-        const shape = this.elementFactory.createShape({ type: 'bpmn:ServiceTask' });
-        this.create.start(event, shape, {
-            source: source
-        });
-        this.appendPreview.cleanUp();
-    }
-}
-
-var customServiceTaskModule = {
-    __init__: ['serviceTaskPaletteProvider', 'serviceTaskContextPadProvider'],
-    serviceTaskPaletteProvider: ['type', ServiceTaskPaletteProvider],
-    serviceTaskContextPadProvider: ['type', ServiceTaskContextPadProvider],
-};
-
 class HideOtherPaletteProvider {
     constructor(palette) {
         this.visibleEntryKeys = [
@@ -1340,7 +1237,6 @@ class HideOtherPaletteProvider {
             'create.start-event',
             'create.end-event',
             'create.user-task',
-            'create.service-task',
             'create.exclusive-gateway',
             'xml'
         ];
@@ -1390,7 +1286,6 @@ class HideOtherContextPadProvider {
             else if (is(element, 'bpmn:Gateway')) {
                 return {
                     'append.user-task': entries['append.user-task'],
-                    'append.service-task': entries['append.service-task'],
                     'append.gateway': entries['append.gateway'],
                     'append.end-event': entries['append.end-event'],
                     'connect': entries['connect'],
@@ -1401,7 +1296,6 @@ class HideOtherContextPadProvider {
             }
             return {
                 'append.user-task': entries['append.user-task'],
-                'append.service-task': entries['append.service-task'],
                 'append.gateway': entries['append.gateway'],
                 'append.end-event': entries['append.end-event'],
                 'connect': entries['connect'],
@@ -1469,13 +1363,12 @@ var customHideOtherModule = {
     gatewayReplaceMenuProvider: ['type', GatewayReplaceMenuProvider]
 };
 
-const util = {};
-function addExtensionProperty(element, key, value) {
+function addExtensionProperty(element, key, value, bpmnFactory, modeling) {
     let extensionElements = element.businessObject.get('extensionElements');
     if (!extensionElements) {
-        extensionElements = util.bpmnFactory.create('bpmn:ExtensionElements', { values: [] });
+        extensionElements = bpmnFactory.create('bpmn:ExtensionElements', { values: [] });
         extensionElements.$parent = element.businessObject;
-        util.modeling.updateModdleProperties(element, element.businessObject, { extensionElements });
+        modeling.updateModdleProperties(element, element.businessObject, { extensionElements });
     }
     let properties = null;
     const extensionElementValues = extensionElements.get('values');
@@ -1484,125 +1377,73 @@ function addExtensionProperty(element, key, value) {
         properties = existPropertiesElements[0];
     }
     if (!properties) {
-        properties = util.bpmnFactory.create('camunda:Properties', { values: [] });
+        properties = bpmnFactory.create('camunda:Properties', { values: [] });
         properties.$parent = extensionElements;
-        util.modeling.updateModdleProperties(element, extensionElements, { values: [...extensionElements.get('values'), properties] });
+        modeling.updateModdleProperties(element, extensionElements, { values: [...extensionElements.get('values'), properties] });
     }
     const propertyValues = properties.get('values');
     const existPropertyIndex = propertyValues.findIndex((value) => value.name === key);
     if (existPropertyIndex > -1) {
-        util.modeling.updateModdleProperties(element, propertyValues[existPropertyIndex], { name: key, value });
+        modeling.updateModdleProperties(element, propertyValues[existPropertyIndex], { name: key, value });
     }
     else {
-        const property = util.bpmnFactory.create('camunda:Property', { name: key, value });
+        const property = bpmnFactory.create('camunda:Property', { name: key, value });
         property.$parent = properties;
-        util.modeling.updateModdleProperties(element, properties, { values: [...properties.get('values'), property] });
-    }
-}
-function getExtensionPropertyValue(element, key) {
-    let extensionElements = element.businessObject.get('extensionElements');
-    if (!extensionElements) {
-        return '';
-    }
-    let properties = null;
-    const extensionElementValues = extensionElements.get('values');
-    const existPropertiesElements = extensionElementValues.filter((value) => is(value, 'camunda:Properties'));
-    if (existPropertiesElements.length > 0) {
-        properties = existPropertiesElements[0];
-    }
-    if (!properties) {
-        return '';
-    }
-    const propertyValues = properties.get('values');
-    const existPropertyIndex = propertyValues.findIndex((value) => value.name === key);
-    if (existPropertyIndex > -1) {
-        return propertyValues[existPropertyIndex].value;
+        modeling.updateModdleProperties(element, properties, { values: [...properties.get('values'), property] });
     }
 }
 
 // @ts-ignore
-class TaskDescriptionProps {
+class DescriptionProps {
     constructor(props) {
         this.id = 'Coast_taskDescription';
-        const { element } = props;
+        const { element, translate, bpmnFactory, modeling, debounce } = props;
         this.component = () => {
-            return TextAreaEntry({
-                element: element,
+            return TextFieldEntry({
                 id: this.id,
-                label: util.translate('Task description'),
-                getValue: () => {
-                    return getExtensionPropertyValue(element, this.id);
-                },
-                setValue: (value) => {
-                    addExtensionProperty(element, this.id, value);
-                },
-                debounce: util.debounce,
-                autoResize: true
-            });
-        };
-        this.isEdited = isTextAreaEntryEdited;
-    }
-}
-
-// @ts-ignore
-class UserAssignmentStaticOrDynamicProps {
-    constructor(props) {
-        this.id = 'Coast_userAssignment_staticOrDynamic';
-        const { element } = props;
-        this.component = () => {
-            return SelectEntry({
                 element: element,
-                id: this.id,
-                label: util.translate('Set assignment rule'),
+                label: translate('Task Description'),
                 getValue: () => {
-                    return getExtensionPropertyValue(element, this.id);
+                    return element.businessObject.get('taskDescription') || '';
                 },
                 setValue: (value) => {
-                    addExtensionProperty(element, this.id, value);
+                    modeling.updateModdleProperties(element, element.businessObject, {
+                        'taskDescription': value
+                    });
+                    addExtensionProperty(element, 'taskDescription', value, bpmnFactory, modeling);
                 },
-                getOptions: () => {
-                    return [
-                        { value: '', label: util.translate('dynamic user') },
-                        { value: 'static_user', label: util.translate('static user') },
-                        { value: 'dynamic_role', label: util.translate('dynamic role') },
-                        { value: 'static_role', label: util.translate('static role') }
-                    ];
-                }
+                debounce
             });
         };
-        this.isEdited = isSelectEntryEdited;
+        this.isEdited = isTextFieldEntryEdited;
     }
 }
 
-function getUserAssignmentProps(element) {
-    return [new UserAssignmentStaticOrDynamicProps(element)];
-}
-
 class CustomPropertiesProvider {
     constructor(propertiesPanel, translate, bpmnFactory, modeling, debounceInput) {
         this.translate = translate;
-        util.translate = translate;
-        util.bpmnFactory = bpmnFactory;
-        util.modeling = modeling;
-        util.debounce = debounceInput;
+        this.bpmnFactory = bpmnFactory;
+        this.modeling = modeling;
+        this.debounceInput = debounceInput;
         propertiesPanel.registerProvider(0, this);
     }
     getGroups(element) {
         return ((groups) => {
-            const generalGroup = groups.find((group) => group.id === 'general');
-            generalGroup.shouldOpen = true;
-            console.log(generalGroup);
-            if (is(element, 'bpmn:Process')) {
-                generalGroup.entries.splice(1, 3);
-            }
-            else if (is(element, 'bpmn:UserTask')) {
-                generalGroup.entries.splice(1, 1);
-                generalGroup.entries.push(...[
-                    new TaskDescriptionProps({ element }),
-                    ...getUserAssignmentProps({ element })
-                ]);
-            }
-            return [generalGroup];
+            if (is(element, 'bpmn:UserTask')) {
+                console.log(groups);
+                return [groups.find((group) => group.id === 'general'), {
+                        id: 'Coast_Implementation',
+                        label: this.translate('More config'),
+                        entries: [new DescriptionProps({
+                                element,
+                                translate: this.translate,
+                                bpmnFactory: this.bpmnFactory,
+                                modeling: this.modeling,
+                                debounce: this.debounceInput
+                            })]
+                    }];
+            }
+            return groups;
         });
     }
 }
@@ -1612,6 +1453,38 @@ var customPropertiesPanelModule = {
     customPropertiesProvider: ['type', CustomPropertiesProvider]
 };
 
+var name = "Coast Custom";
+var prefix = "coast";
+var uri = "https://c-standard.cn";
+var xml = {
+	tagAlias: "lowerCase"
+};
+var associations = [
+];
+var types = [
+	{
+		name: "CoastUserTask",
+		"extends": [
+			"bpmn:UserTask"
+		],
+		properties: [
+			{
+				name: "taskDescription",
+				isAttr: true,
+				type: "String"
+			}
+		]
+	}
+];
+var coastModdleDescriptor = {
+	name: name,
+	prefix: prefix,
+	uri: uri,
+	xml: xml,
+	associations: associations,
+	types: types
+};
+
 class CodeEditorComponent {
     set code(code) {
         this._code = code || '';
@@ -1687,24 +1560,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.7", ngImpor
 class CamundaBpmnEditorComponent {
     constructor() {
         this.isShowXml = false;
-        this.initialDiagram = '<?xml version="1.0" encoding="UTF-8"?>' +
-            '<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
-            'xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" ' +
-            'xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" ' +
-            'xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" ' +
-            'targetNamespace="http://bpmn.io/schema/bpmn" ' +
-            'id="Definitions_1">' +
-            '<bpmn:process id="Process_1" isExecutable="true">' +
-            '<bpmn:startEvent id="StartEvent_1"/>' +
-            '</bpmn:process>' +
-            '<bpmndi:BPMNDiagram id="BPMNDiagram_1">' +
-            '<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">' +
-            '<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">' +
-            '<dc:Bounds height="36.0" width="36.0" x="173.0" y="102.0"/>' +
-            '</bpmndi:BPMNShape>' +
-            '</bpmndi:BPMNPlane>' +
-            '</bpmndi:BPMNDiagram>' +
-            '</bpmn:definitions>';
     }
     ngAfterViewInit() {
         this.modeler = new BpmnModeler({
@@ -1718,17 +1573,19 @@ class CamundaBpmnEditorComponent {
             additionalModules: [
                 customTranslateModule,
                 customUserTaskModule,
-                customServiceTaskModule,
                 customHideOtherModule,
                 customPropertiesPanelModule
-            ]
+            ],
+            moddleExtensions: {
+                coast: coastModdleDescriptor
+            }
         });
         const logo = this.modeler._container.querySelector('.bjs-powered-by');
         if (logo) {
             this.modeler._container.removeChild(logo);
         }
         this.canvas = this.modeler.get('canvas');
-        this.modeler.importXML(this.initialDiagram).then(() => {
+        this.modeler.createDiagram().then(() => {
             this.canvas.zoom('fit-viewport');
         });
     }
@@ -1935,32 +1792,30 @@ class DataGridService {
         }, undefined, onSuccess);
     }
     getUserInfo(uid) {
-        if (this.userInfoCache.hasOwnProperty(uid)) {
-            return of(this.userInfoCache[uid]);
+        if (!this.userInfoCache.hasOwnProperty(uid)) {
+            this.userInfoCache[uid] = this.http.get('api/data/custom', {
+                params: {
+                    executor: 'com.cs.system.user.GetUserInfo',
+                    uid
+                }
+            }).pipe(shareReplay(1), map(response => {
+                return response.data;
+            }));
         }
-        return this.http.get('api/data/custom', {
-            params: {
-                executor: 'com.cs.system.user.GetUserInfo',
-                uid
-            }
-        }).pipe(map(response => {
-            this.userInfoCache[uid] = response.data;
-            return response.data;
-        }));
+        return this.userInfoCache[uid];
     }
     getUnitInfo(uid) {
-        if (this.unitInfoCache.hasOwnProperty(uid)) {
-            return of(this.unitInfoCache[uid]);
+        if (!this.unitInfoCache.hasOwnProperty(uid)) {
+            this.unitInfoCache[uid] = this.http.get('api/data/custom', {
+                params: {
+                    executor: 'com.cs.system.user.GetUnitInfo',
+                    uid
+                }
+            }).pipe(shareReplay(1), map(response => {
+                return response.data;
+            }));
         }
-        return this.http.get('api/data/custom', {
-            params: {
-                executor: 'com.cs.system.user.GetUnitInfo',
-                uid
-            }
-        }).pipe(map(response => {
-            this.unitInfoCache[uid] = response.data;
-            return response.data;
-        }));
+        return this.unitInfoCache[uid];
     }
 }
 DataGridService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.7", ngImport: i0, type: DataGridService, deps: [{ token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });