cloud-web-corejs 1.0.54-dev.497 → 1.0.54-dev.499

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue

@@ -85,6 +85,15 @@ export default {
         let hasWf = this.getHasWf() || false;
         result = result && !hasWf;
       }*/
+      if(!this.designState){
+        let authCode = this.$parent.getAuthCode ? this.$parent.getAuthCode() : null
+        if(authCode){
+          let dispermissions = this.$store.getters.dispermissions;
+          if (dispermissions.includes(authCode)) {
+            result = false
+          }
+        }
+      }
       return result;
     }
 

package/src/components/xform/form-designer/setting-panel/property-editor/name-editor.vue

@@ -1,26 +1,51 @@
 <template>
-  <el-form-item prop="name" :rules="nameRequiredRule">
-    <span slot="label">{{ i18nt('designer.setting.uniqueName') }}
-      <el-tooltip effect="light" :content="i18nt('designer.setting.editNameHelp')">
-        <i class="el-icon-info"></i></el-tooltip>
-    </span>
-    <template v-if="(!!selectedWidget.category && (selectedWidget.type !== 'sub-form')) || noFieldList">
-      <el-input type="text" v-model="optionModel.name" :readonly="widgetNameReadonly"
-                @change="updateWidgetNameAndRef"></el-input>
-    </template>
-    <template v-else>
-      <el-select v-model="optionModel.name" allow-create filterable :disabled="true"
-                 @change="updateWidgetNameAndRef"
-                 :title="i18nt('designer.setting.editNameHelp')">
-        <el-option v-for="(sf, sfIdx) in serverFieldList" :key="sfIdx" :label="sf.label" :value="sf.name"></el-option>
-      </el-select>
-    </template>
-  </el-form-item>
+  <div>
+    <el-form-item prop="name" :rules="nameRequiredRule">
+      <span slot="label"
+        >{{ i18nt("designer.setting.uniqueName") }}
+        <el-tooltip effect="light" :content="i18nt('designer.setting.editNameHelp')">
+          <i class="el-icon-info"></i
+        ></el-tooltip>
+      </span>
+      <template
+        v-if="
+          (!!selectedWidget.category && selectedWidget.type !== 'sub-form') || noFieldList
+        "
+      >
+        <el-input
+          type="text"
+          v-model="optionModel.name"
+          :readonly="widgetNameReadonly"
+          @change="updateWidgetNameAndRef"
+        ></el-input>
+      </template>
+      <template v-else>
+        <el-select
+          v-model="optionModel.name"
+          allow-create
+          filterable
+          :disabled="true"
+          @change="updateWidgetNameAndRef"
+          :title="i18nt('designer.setting.editNameHelp')"
+        >
+          <el-option
+            v-for="(sf, sfIdx) in serverFieldList"
+            :key="sfIdx"
+            :label="sf.label"
+            :value="sf.name"
+          ></el-option>
+        </el-select>
+      </template>
+    </el-form-item>
+    <el-form-item label="菜单按钮权限编码" v-show="showAuthCode">
+      <div style="word-break: break-all">{{ authCode }}</div>
+    </el-form-item>
+  </div>
 </template>
 
 <script>
-import i18n from "../../../../../components/xform/utils/i18n"
-import {isEmptyStr} from "../../../../../components/xform/utils/util"
+import i18n from "../../../../../components/xform/utils/i18n";
+import { isEmptyStr } from "../../../../../components/xform/utils/util";
 
 export default {
   name: "name-editor",
@@ -31,53 +56,80 @@ export default {
     optionModel: Object,
     parentList: Array,
   },
-  inject: ['serverFieldList', 'getDesignerConfig', 'isDataTableChildWidget'],
+  inject: ["serverFieldList", "getDesignerConfig", "isDataTableChildWidget"],
   data() {
     return {
-      nameRequiredRule: [{required: true, message: 'name required'}],
-    }
+      nameRequiredRule: [{ required: true, message: "name required" }],
+    };
   },
   computed: {
     noFieldList() {
-      return !this.serverFieldList || (this.serverFieldList.length <= 0)
+      return !this.serverFieldList || this.serverFieldList.length <= 0;
     },
 
     widgetNameReadonly() {
-      return !!this.getDesignerConfig().widgetNameReadonly
+      return !!this.getDesignerConfig().widgetNameReadonly;
+    },
+    showAuthCode() {
+      // return this.selectedWidget.category !== "container";
+      return [
+        "button",
+        "a-text",
+        "a-link",
+        "a-link2",
+        "search_button",
+        "save_button",
+        "reset_button",
+        "table-export-button",
+        "select-export-button",
+        "add_button",
+        "import-button",
+        "import2-button",
+        "print-button",
+        "print-detail-button",
+        "download-button",
+        "copy_button",
+        "tempStorage",
+      ].includes(this.selectedWidget.type);
+    },
+    authCode() {
+      return (
+        this.designer.vueInstance?.reportTemplate?.formCode + ":" + this.optionModel.name
+      );
     },
-
   },
   methods: {
     updateWidgetNameAndRef(newName) {
-      let oldName = this.designer.selectedWidgetName
+      let oldName = this.designer.selectedWidgetName;
       if (isEmptyStr(newName)) {
-        this.selectedWidget.options.name = oldName
-        this.$message.info(this.i18nt('designer.hint.nameRequired'))
-        return
+        this.selectedWidget.options.name = oldName;
+        this.$message.info(this.i18nt("designer.hint.nameRequired"));
+        return;
       }
 
       if (!!this.designer.formWidget) {
-        let foundRef = this.designer.formWidget.getWidgetRef(newName) // 检查newName是否已存在！！
+        let foundRef = this.designer.formWidget.getWidgetRef(newName); // 检查newName是否已存在！！
 
         if (!!foundRef) {
           if (this.isDataTableChildWidget()) {
             let parentList = this.parentList;
-            for (let i;i<parentList.length;i++){
-
-            }
-
-          }else{
-            this.selectedWidget.options.name = oldName
-            this.$message.info(this.i18nt('designer.hint.duplicateName') + newName)
-            return
+            for (let i; i < parentList.length; i++) {}
+          } else {
+            this.selectedWidget.options.name = oldName;
+            this.$message.info(this.i18nt("designer.hint.duplicateName") + newName);
+            return;
           }
         }
 
-        let widgetInDesign = this.designer.formWidget.getWidgetRef(oldName)
+        let widgetInDesign = this.designer.formWidget.getWidgetRef(oldName);
         if (!!widgetInDesign && !!widgetInDesign.registerToRefList) {
-          widgetInDesign.registerToRefList(oldName)  //注册组件新的ref名称并删除老的ref！！
-          let newLabel = this.getLabelByFieldName(newName)
-          this.designer.updateSelectedWidgetNameAndLabel(this.selectedWidget, newName, newLabel)
+          widgetInDesign.registerToRefList(oldName); //注册组件新的ref名称并删除老的ref！！
+          let newLabel = this.getLabelByFieldName(newName);
+          this.designer.updateSelectedWidgetNameAndLabel(
+            this.selectedWidget,
+            newName,
+            newLabel
+          );
         }
       }
     },
@@ -85,17 +137,14 @@ export default {
     getLabelByFieldName(fieldName) {
       for (let i = 0; i < this.serverFieldList.length; i++) {
         if (this.serverFieldList[i].name === fieldName) {
-          return this.serverFieldList[i].label
+          return this.serverFieldList[i].label;
         }
       }
 
-      return null
+      return null;
     },
-
-  }
-}
+  },
+};
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

package/src/views/user/form/vform/designer.vue

@@ -104,7 +104,8 @@ export default {
         this.showDesinger = true;
         this.$nextTick(() => {
           let formJson = this.$baseLodash.cloneDeep({
-            widgetList: this.widgetList
+            widgetList: this.widgetList,
+            formConfig:{}
           });
           this.$refs.designer.setFormJson(formJson);
         })