fix: save button render invalidate and bind data source submit method not validate permission

ww
1 parent 1e604e83
Showing 2 changed files with 46 additions and 26 deletions
src/main/webapp/js/diagramly/App.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/diagramly/App.js
View file @295d675
+++ b/src/main/webapp/js/diagramly/App.js
View file @295d675
@@ -5036,7 +5036,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 	}
 	getToken()
-
+	
 	var updateButtonContainer = this.updateButtonContainer
 	// var lockUnlock = this.actions.actions.lockUnlock.funct
 	// var selectAll = this.actions.actions.selectAll.funct
@@ -5044,6 +5044,7 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 			defHttp.get('/yt/role/me/permissions')
 				.then(res => {
 					USER_PERMISSION.permission = res
+					console.log({USER_PERMISSION})
 					updateButtonContainer()
 					// var flag = hasSavePermission()
 					// if (!flag) {
@@ -5978,30 +5979,28 @@ App.prototype.updateButtonContainer = function()
 					this.buttonContainer.appendChild(this.shareButton);
 					// TODO thingsKit 保存按钮
-					var flag = hasSavePermission()
-					if (flag) {
-						this.saveButton = document.createElement('div');
-						this.saveButton.className = 'geBtn gePrimaryBtn';
-						this.saveButton.style.display = 'inline-block';
-						this.saveButton.style.backgroundColor = '#F2931E';
-						this.saveButton.style.borderColor = '#F08705';
-						this.saveButton.style.backgroundImage = 'none';
-						this.saveButton.style.marginTop = '-10px';
-						this.saveButton.style.lineHeight = '28px';
-						this.saveButton.style.minWidth = '0px';
-						this.saveButton.style.cssFloat = 'right';
-						this.saveButton.setAttribute('title', '保存');
-						mxUtils.write(this.saveButton, '保存');
-						mxEvent.addListener(this.saveButton, 'click', mxUtils.bind(this, function()
-						{
-							this.currentFile.ui.actions.get(
-								(this.currentFile.mode == null || !this.currentFile.isEditable())
-									? 'saveAs'
-									: 'save')
-								.funct();
-						}));
-						this.buttonContainer.appendChild(this.saveButton);
-					}
+					this.saveButton = document.createElement('div');
+					this.saveButton.className = 'geBtn gePrimaryBtn';
+					this.saveButton.style.display = 'inline-block';
+					this.saveButton.style.backgroundColor = '#F2931E';
+					this.saveButton.style.borderColor = '#F08705';
+					this.saveButton.style.backgroundImage = 'none';
+					this.saveButton.style.marginTop = '-10px';
+					this.saveButton.style.lineHeight = '28px';
+					this.saveButton.style.minWidth = '0px';
+					this.saveButton.style.cssFloat = 'right';
+					this.saveButton.setAttribute('title', '保存');
+					this.saveButton.setAttribute('id', 'thingskitSaveButton');
+					mxUtils.write(this.saveButton, '保存');
+					mxEvent.addListener(this.saveButton, 'click', mxUtils.bind(this, function()
+					{
+						this.currentFile.ui.actions.get(
+							(this.currentFile.mode == null || !this.currentFile.isEditable())
+								? 'saveAs'
+								: 'save')
+							.funct();
+					}));
+					this.buttonContainer.appendChild(this.saveButton);
@@ -6062,6 +6061,11 @@ App.prototype.updateButtonContainer = function()
 		{
 			this.fetchAndShowNotification(urlParams['notif']);
 		}
+	} else {
+		if (!hasSavePermission()) {
+		 	var el =	document.getElementById('thingskitSaveButton')
+			el && el.remove()
+		}
 	}
 };
--- a/src/main/webapp/js/grapheditor/Format.js
View file @295d675
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @295d675
@@ -418,7 +418,7 @@ Format.prototype.immediateRefresh = function () {
         const basicAttr = sidebarInstance.enumCellBasicAttribute
         const componentType = cell.getAttribute(basicAttr.COMPONENT_TYPE)
         const hasPermission = sidebarInstance.getComponentPermission(componentType)
-        return !!hasPermission.length
+        return !!hasPermission.length && hasSavePermission()
     }
     var addClickHandler = mxUtils.bind(
@@ -5898,6 +5898,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         $(panel).addClass('data-source__submit-panel').append(`<button type="button" lay-submit lay-filter="formDataSource" class="layui-btn">保存</button>`)
         $(container).append(panel)
         form.on('submit(formDataSource)', async function (data) {
+            if (!hasSavePermission()) {
+                UseLayUi.topErrorMsg('没有权限')
+                return
+            }
             const { field } = data
             const value = getValueOnSubmit(field)
             await to(autoSaveGraphInfo())
@@ -6261,6 +6265,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description
          */
         async function submit(callback) {
+            if (!hasPermission()) return
             const data = Array.from({ length: addRowNumber }).map((_, row) => form.val(getRowFilter(row))).filter(item => Object.keys(item).length)
             const defaultImageConfig = form.val(enumActionEl.DEFAULT_IMAGE_FILTER)
             defaultImageConfig[enumConst.DEFAULT_IMAGE_FLAG] = true
@@ -6709,6 +6714,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 保存
          */
         async function submit(callback) {
+            if (!hasPermission()) return
             const data = Array.from({ length: addRowNumber }).map((_, row) => form.val(getRowFilter(row))).filter(item => Object.keys(item).length)
             if (!validate(data)) return
             const formModal = {
@@ -6963,6 +6969,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 编辑数据交互
          */
         async function submit(callback) {
+            if (!hasPermission()) return
             const formVal = form.val(enumActionEl.FORM_FILTER)
             const isParamsSetting = formVal[enumConst.ACTION] === enumActionType.PARAMS_SETTING
             const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
@@ -7381,6 +7388,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         async function submit(callback) {
+            if (!hasPermission()) return
             const tableData = Array.from({ length: addRowNumber }).map((_, index) => form.val(getRowFilter(index))).filter(obj => Object.keys(obj).length)
             if (!validate(tableData)) return
             const formVal = form.val(enumActionEl.FORM_FILTER)
@@ -7618,6 +7626,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         }
         async function submit(callback) {
+            if (!hasPermission()) return
+
             const enableValue = form.val(enumActionEl.ENABLE_FILTER)
             const closeValue = form.val(enumActionEl.CLOSE_FILTER)
@@ -8344,6 +8354,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         `
     }
+    function hasPermission() {
+        let flag = hasSavePermission()
+        if (!flag) UseLayUi.topErrorMsg('没有权限')
+        return flag
+    }
+
     //  异步设置此处才能生效 -- 设置默认select和样式和初始化侧边栏生成组件和事件绑定
     setTimeout(() => {