Skip to content

F
flowable-engine-fontend
Commit 41cc558e authored by godlovericea's avatar godlovericea
Browse files
Options

add: btn

parent c3efd5df
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 157 deletions
editor-app/configuration/properties-default-controllers.js
View file @ 41cc558e
...@@ -24,7 +24,7 @@ window.share && window.share.event.on("editCurrentNodeForm", (params)=> { ...@@ -24,7 +24,7 @@ window.share && window.share.event.on("editCurrentNodeForm", (params)=> {
}) })
window.share && window.share.event.on("editCurrentNodeId", (paramsId)=>{ window.share && window.share.event.on("editCurrentNodeId", (paramsId)=>{
// console.log(paramsId) // console.log(nodeIdParams, "nodeIdParams---上面")
nodeIdParams = paramsId nodeIdParams = paramsId
}) })
...@@ -130,18 +130,16 @@ angular.module('flowableModeler').controller('FlowableTextPropertyPopupCtrl', [' ...@@ -130,18 +130,16 @@ angular.module('flowableModeler').controller('FlowableTextPropertyPopupCtrl', ['
$scope.$hide(); $scope.$hide();
}; };
}]); }]);
angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$rootScope','$scope', '$http', function($rootScope, $scope, $http) { angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$rootScope','$scope', '$http', function($rootScope, $scope, $http) {
window.share && window.share.event.on("editCurrentNodeId", (params)=>{ window.share && window.share.event.on("editCurrentNodeId", (params)=>{
// console.log(params) // console.log(params, "editCurrentNodeId----下面")
nodeIdParams = params nodeIdParams = params
}) })
if (nodeIdParams && shareformKey) { if (nodeIdParams && shareformKey) {
// console.log("properties-default-control---GetColumnConfig")
$http.get(FLOWABLE.APP_URL.GetColumnConfig(nodeIdParams, shareformKey)) $http.get(FLOWABLE.APP_URL.GetColumnConfig(nodeIdParams, shareformKey))
.success((res)=>{ .success((res)=>{
if (res.FieldConfigList && res.FieldConfigList.length > 0) { if (res.FieldConfigList && res.FieldConfigList.length > 0) {
var result = []; var result = [];
......
editor-app/configuration/properties-form-reference-controller.js
View file @ 41cc558e
...@@ -103,6 +103,8 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl', ...@@ -103,6 +103,8 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl',
const formKey = $scope.selectedForm.TableName const formKey = $scope.selectedForm.TableName
const nodeId = $rootScope.currentReadResourceId || $rootScope.resourceId const nodeId = $rootScope.currentReadResourceId || $rootScope.resourceId
// console.log("properties-form-reference-controller-----GetTableFieldConfig")
if (formKey) {
$http.get(FLOWABLE.APP_URL.GetTableFieldConfig(formKey)) $http.get(FLOWABLE.APP_URL.GetTableFieldConfig(formKey))
.success((res)=>{ .success((res)=>{
let formArr = [] let formArr = []
...@@ -138,6 +140,9 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl', ...@@ -138,6 +140,9 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl',
} }
}) })
}) })
} else {
$scope.close();
}
}) })
} else { } else {
$scope.property.value = null; $scope.property.value = null;
......
editor-app/configuration/properties/form-reference-popup.html
View file @ 41cc558e
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="col-xs-12 editor-item-picker"> <div class="col-xs-12 editor-item-picker">
<div ng-if="!state.loadingForms && !state.formError" class="col-xs-4 editor-item-picker-component" ng-repeat="form in forms" ng-class="{'selected' : form.formId == selectedForm.formId}" ng-click="selectForm(form, $event)"> <div ng-if="!state.loadingForms && !state.formError" class="col-xs-4 editor-item-picker-component" ng-repeat="form in forms" ng-class="{'selected' : form.formId == selectedForm.formId}" ng-click="selectForm(form, $event)">
<div class="controls" style="margin-right: 5px;"> <div class="controls" style="margin-right: 5px;">
<input type="checkbox" value="option1" ng-click="selectForm(form, $event)" ng-checked="form.id == selectedForm.id" /> <input type="checkbox" value="option1" ng-click="selectForm(form, $event)" ng-checked="form.key == selectedForm.key" />
</div> </div>
<h4>{{form.name}}</h4> <h4>{{form.name}}</h4>
<!-- <img ng-src="{{getModelThumbnailUrl(form.id)}}" /> --> <!-- <img ng-src="{{getModelThumbnailUrl(form.id)}}" /> -->
......
editor-app/stencil-controller.js
View file @ 41cc558e
...@@ -19,8 +19,8 @@ let nodeId = "" ...@@ -19,8 +19,8 @@ let nodeId = ""
let selectCurrentNodeId = "" let selectCurrentNodeId = ""
angular.module('flowableModeler') angular.module('flowableModeler')
.controller('StencilController', ['$rootScope', '$scope', '$http', '$modal', '$timeout', '$window', 'editorManager', .controller('StencilController', ['$rootScope', '$scope', '$http', '$modal', '$timeout', '$window', 'editorManager','$routeParams',
function ($rootScope, $scope, $http, $modal, $timeout, $window, editorManager) { function ($rootScope, $scope, $http, $modal, $timeout, $window, editorManager, $routeParams) {
// Property window toggle state // Property window toggle state
$scope.propertyWindowState = {'collapsed': false}; $scope.propertyWindowState = {'collapsed': false};
...@@ -394,148 +394,36 @@ angular.module('flowableModeler') ...@@ -394,148 +394,36 @@ angular.module('flowableModeler')
// console.log("新增节点逻辑") // console.log("新增节点逻辑")
// console.log(nodeIdList, 'nodeIdList nodeIdList nodeIdList nodeIdList') // console.log(nodeIdList, 'nodeIdList nodeIdList nodeIdList nodeIdList')
window.share && window.share.event.on("currentNodeForm", (params)=> { window.share && window.share.event.on("currentNodeForm", (params)=> {
// console.log(params)
formKey = params.name //表名 formKey = params.name //表名
// console.log(formKey, "currentNodeForm...currentNodeForm") // console.log(formKey, "currentNodeForm...currentNodeForm")
nodeIdList.push({ nodeIdList.push({
nodeId: $rootScope.currentReadResourceId, nodeId: $rootScope.currentReadResourceId,
formKey: formKey formKey: formKey
}) })
if ($rootScope.currentReadResourceId && formKey) { // if ($rootScope.currentReadResourceId && formKey) {
let currentObjArr = [] // let currentObjArr = []
$http.get(FLOWABLE.APP_URL.GetTableFieldConfig(formKey)) // console.log("新增节点逻辑")
.success((res)=>{ // console.log("stencil-controller-----GetTableFieldConfig")
let formArr = [] // $http.get(FLOWABLE.APP_URL.GetTableFieldConfig(formKey))
const Values = res.getMe[0].Values
const Groups = res.getMe[0].Groups
Values.forEach((item)=>{
formArr.push({
ActID: $rootScope.currentReadResourceId,
Config: '',
FieldCode: item.FieldName,
FieldName: item.FieldName,
FieldType: 'string',
FormKey: formKey,
IsShow: 1,
Type:"",
Unit:"",
IsRequired: false,
IsReadOnly: "0"
})
})
var result = [];
var obj = {};
for(var i =0; i<formArr.length; i++){
if(!obj[formArr[i].FieldCode]){
result.push(formArr[i]);
obj[formArr[i].FieldCode] = true;
}
}
let fieldTitle = {
description: '',
hasReadWriteMode: false,
hidden: false,
mode: "read",
readModeTemplateUrl: "",
readonly: false,
title: '表单字段',
type: "string",
value: true,
writeModeTemplateUrl: "",
}
const extraFormTitle = {
description: '',
hasReadWriteMode: false,
hidden: false,
mode: "read",
readModeTemplateUrl: "",
readonly: false,
title: '外接表单',
type: "string",
value: true,
writeModeTemplateUrl: "",
}
const extraFormObj = {
description: '',
hasReadWriteMode: false,
hidden: false,
key: key,
mode: "read",
readModeTemplateUrl: "editor-app/configuration/properties/extra-form-read-config.html?version=" + (new Date()).getTime(),
readonly: false,
title: '',
type: "extraForm",
value: true,
properties: ['product'],
writeModeTemplateUrl: "editor-app/configuration/properties/extra-form-write-config.html?version=" + (new Date()).getTime(),
}
currentObjArr.push(fieldTitle)
Groups.forEach((item)=>{
const currentObj = {
description: '',
hasReadWriteMode: false,
hidden: false,
key: key,
mode: "read",
readModeTemplateUrl: "editor-app/configuration/properties/form-field-read-config.html?version=" + (new Date()).getTime(),
readonly: false,
title: item.GroupName,
type: "cusFieldConfig",
value: true,
properties: generatorArr(item),
writeModeTemplateUrl: "editor-app/configuration/properties/form-field-write-config.html?version=" + (new Date()).getTime(),
}
currentObjArr.push(currentObj)
})
// currentObjArr.push(extraFormTitle)
// currentObjArr.push(extraFormObj)
// console.log(currentObjArr)
$rootScope.formKeyList = selectedItem.properties
let preArr = []
let nextArr = []
if ($rootScope.formKeyList.length > 14 && $rootScope.formKeyList[14].key === "oryx-formreference") {
preArr = $rootScope.formKeyList.slice(0,15)
nextArr = $rootScope.formKeyList.slice(15)
}
selectedItem.properties = preArr.concat(currentObjArr).concat(nextArr)
// console.log(selectedItem.properties, "selectedItem.properties")
// const Values = res.getMe[0].Values
})
// 之前的逻辑
// $http.get(FLOWABLE.APP_URL.GetColumnConfig($rootScope.resourceId, formKey))
// .success((res)=>{ // .success((res)=>{
// // console.log("新增节点逻辑，新增success、")
// let FormJson = JSON.parse(res.FormJson)
// const formJsonProperties = FormJson.schema.properties
// let formArr = [] // let formArr = []
// const Values = res.getMe[0].Values
// for (key in formJsonProperties) { // const Groups = res.getMe[0].Groups
// for (let ckey in formJsonProperties[key].properties) { // Values.forEach((item)=>{
// let params = formJsonProperties[key].properties[ckey]
// formArr.push({ // formArr.push({
// ActID: $rootScope.currentReadResourceId, // ActID: $rootScope.currentReadResourceId,
// Config: '', // Config: '',
// FieldCode: ckey, // FieldCode: item.FieldName,
// FieldName: params.title, // FieldName: item.FieldName,
// FieldType: params.type, // FieldType: 'string',
// FormKey: formKey, // FormKey: formKey,
// IsShow: 1, // IsShow: 1,
// Type:"", // Type:"",
// Unit:"", // Unit:"",
// IsRequired: false // IsRequired: false,
// IsReadOnly: "0"
// })
// }) // })
// }
// }
// var result = []; // var result = [];
// var obj = {}; // var obj = {};
// for(var i =0; i<formArr.length; i++){ // for(var i =0; i<formArr.length; i++){
...@@ -544,18 +432,7 @@ angular.module('flowableModeler') ...@@ -544,18 +432,7 @@ angular.module('flowableModeler')
// obj[formArr[i].FieldCode] = true; // obj[formArr[i].FieldCode] = true;
// } // }
// } // }
// $http({method: 'POST', url: FLOWABLE.APP_URL.SaveColumnConfig($rootScope.currentReadResourceId, decodeURI(formKey)), data: result})
// .success(function(res) {
// // console.log(res)
// })
// let fatherObj = FormJson.schema.properties
// function generatorArr(objCollections) {
// let arr = []
// for(let key in objCollections) {
// arr.push({...objCollections[key],key})
// }
// return arr
// }
// let fieldTitle = { // let fieldTitle = {
// description: '', // description: '',
// hasReadWriteMode: false, // hasReadWriteMode: false,
...@@ -595,7 +472,7 @@ angular.module('flowableModeler') ...@@ -595,7 +472,7 @@ angular.module('flowableModeler')
// writeModeTemplateUrl: "editor-app/configuration/properties/extra-form-write-config.html?version=" + (new Date()).getTime(), // writeModeTemplateUrl: "editor-app/configuration/properties/extra-form-write-config.html?version=" + (new Date()).getTime(),
// } // }
// currentObjArr.push(fieldTitle) // currentObjArr.push(fieldTitle)
// for(let key in fatherObj) { // Groups.forEach((item)=>{
// const currentObj = { // const currentObj = {
// description: '', // description: '',
// hasReadWriteMode: false, // hasReadWriteMode: false,
...@@ -604,18 +481,18 @@ angular.module('flowableModeler') ...@@ -604,18 +481,18 @@ angular.module('flowableModeler')
// mode: "read", // mode: "read",
// readModeTemplateUrl: "editor-app/configuration/properties/form-field-read-config.html?version=" + (new Date()).getTime(), // readModeTemplateUrl: "editor-app/configuration/properties/form-field-read-config.html?version=" + (new Date()).getTime(),
// readonly: false, // readonly: false,
// title: fatherObj[key].title, // title: item.GroupName,
// type: "cusFieldConfig", // type: "cusFieldConfig",
// value: true, // value: true,
// properties: generatorArr(fatherObj[key].properties), // properties: generatorArr(item),
// writeModeTemplateUrl: "editor-app/configuration/properties/form-field-write-config.html?version=" + (new Date()).getTime(), // writeModeTemplateUrl: "editor-app/configuration/properties/form-field-write-config.html?version=" + (new Date()).getTime(),
// } // }
// currentObjArr.push(currentObj) // currentObjArr.push(currentObj)
// } // })
// currentObjArr.push(extraFormTitle) // // currentObjArr.push(extraFormTitle)
// currentObjArr.push(extraFormObj) // // currentObjArr.push(extraFormObj)
// console.log(currentObjArr) // // console.log(currentObjArr)
// $rootScope.formKeyList = selectedItem.properties // $rootScope.formKeyList = selectedItem.properties
// let preArr = [] // let preArr = []
...@@ -629,10 +506,11 @@ angular.module('flowableModeler') ...@@ -629,10 +506,11 @@ angular.module('flowableModeler')
// selectedItem.properties = preArr.concat(currentObjArr).concat(nextArr) // selectedItem.properties = preArr.concat(currentObjArr).concat(nextArr)
// console.log(selectedItem.properties, "selectedItem.properties") // // console.log(selectedItem.properties, "selectedItem.properties")
// // const Values = res.getMe[0].Values
// }) // })
} // }
}) })
// / 以下处理新增编辑逻辑 // / 以下处理新增编辑逻辑
...@@ -643,6 +521,8 @@ angular.module('flowableModeler') ...@@ -643,6 +521,8 @@ angular.module('flowableModeler')
let currentObjArr = [] let currentObjArr = []
$http.get(FLOWABLE.APP_URL.GetTableFieldConfig(clickedShape)) $http.get(FLOWABLE.APP_URL.GetTableFieldConfig(clickedShape))
.success((response)=>{ .success((response)=>{
// console.log("以下处理新增编辑逻辑")
// console.log("stencil-control---GetColumnConfig")
$http.get(FLOWABLE.APP_URL.GetColumnConfig(selectCurrentNodeId ,clickedShape)) $http.get(FLOWABLE.APP_URL.GetColumnConfig(selectCurrentNodeId ,clickedShape))
.success((res)=>{ .success((res)=>{
let currentAddGroups = response.getMe[0].Groups let currentAddGroups = response.getMe[0].Groups
...@@ -767,9 +647,11 @@ angular.module('flowableModeler') ...@@ -767,9 +647,11 @@ angular.module('flowableModeler')
window.share && window.share.event.emit("editCurrentNodeId", params); window.share && window.share.event.emit("editCurrentNodeId", params);
let currentObjArr = [] let currentObjArr = []
$http.get(FLOWABLE.APP_URL.GetTableFieldConfig(clickedShape)) $http.get(FLOWABLE.APP_URL.GetTableFieldConfig(clickedShape))
.success((response)=>{ .success((response)=>{
// console.log("以下处理保存之后得读取数值")
// console.log("stencil-control---GetColumnConfig")
$http.get(FLOWABLE.APP_URL.GetColumnConfig(params ,clickedShape)) $http.get(FLOWABLE.APP_URL.GetColumnConfig(params ,clickedShape))
.success((res)=>{ .success((res)=>{
let currentGroups = response.getMe[0].Groups let currentGroups = response.getMe[0].Groups
......
editor-app/toolbar-controller.js
View file @ 41cc558e
...@@ -52,7 +52,30 @@ angular.module('flowableModeler') ...@@ -52,7 +52,30 @@ angular.module('flowableModeler')
// Click handler for toolbar buttons // Click handler for toolbar buttons
$scope.toolbarButtonClicked = function(buttonIndex) { $scope.toolbarButtonClicked = function(buttonIndex) {
// buttonIndex===0是保存按钮
if (buttonIndex === 0) {
$http.get(FLOWABLE.APP_URL.checkDeployState(editorManager.modelId))
.success((response)=>{
// console.log(response, "response")
if (response.statusCode === "0000") {
// Default behaviour
var buttonClicked = $scope.items[buttonIndex];
var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
executeFunctionByName(buttonClicked.action, window, services);
// Other events
var event = {
type : FLOWABLE.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
toolbarItem : buttonClicked
};
FLOWABLE.eventBus.dispatch(event.type, event);
} else if (response.statusCode === "1001"){
window.alert(response.errMsg)
} else {
window.alert("保存失败！流程出错或者系统出错，请联系管理员。")
}
})
} else {
// Default behaviour // Default behaviour
var buttonClicked = $scope.items[buttonIndex]; var buttonClicked = $scope.items[buttonIndex];
var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager}; var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
...@@ -64,6 +87,18 @@ angular.module('flowableModeler') ...@@ -64,6 +87,18 @@ angular.module('flowableModeler')
toolbarItem : buttonClicked toolbarItem : buttonClicked
}; };
FLOWABLE.eventBus.dispatch(event.type, event); FLOWABLE.eventBus.dispatch(event.type, event);
}
// var buttonClicked = $scope.items[buttonIndex];
// var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
// executeFunctionByName(buttonClicked.action, window, services);
// // Other events
// var event = {
// type : FLOWABLE.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
// toolbarItem : buttonClicked
// };
// FLOWABLE.eventBus.dispatch(event.type, event);
}; };
// Click handler for secondary toolbar buttons // Click handler for secondary toolbar buttons
......
scripts/app-cfg.js
View file @ 41cc558e
...@@ -19,7 +19,7 @@ var FLOWABLE = FLOWABLE || {}; ...@@ -19,7 +19,7 @@ var FLOWABLE = FLOWABLE || {};
var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?modeler\/?$/, '$1').replace(/\/$/, ''); var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?modeler\/?$/, '$1').replace(/\/$/, '');
console.log(pathname) // console.log(pathname)
// FLOWABLE.CONFIG = { // FLOWABLE.CONFIG = {
// 'onPremise' : true, // 'onPremise' : true,
......
scripts/configuration/url-config.js
View file @ 41cc558e
...@@ -196,6 +196,9 @@ FLOWABLE.APP_URL = { ...@@ -196,6 +196,9 @@ FLOWABLE.APP_URL = {
/* FORM MODEL URLS */ /* FORM MODEL URLS */
// 获取模型列表 // 获取模型列表
checkDeployState: function (modelId) {
return `${window.API_ADDRESS}/CheckDeployState?modelId=${modelId}`;
},
getFormModelsUrl: function (FormName) { getFormModelsUrl: function (FormName) {
return `${window.API_ADDRESS}/GetFormListInfo_WithoutForm?FormName=${FormName}&pageIndex=1&pageSize=999&sortFields=id`; return `${window.API_ADDRESS}/GetFormListInfo_WithoutForm?FormName=${FormName}&pageIndex=1&pageSize=999&sortFields=id`;
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment