cloud-web-corejs 1.0.54-dev.189 → 1.0.54-dev.190

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.189",
+  "version": "1.0.54-dev.190",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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

@@ -0,0 +1,220 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">显隐规则</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('启用显隐规则')">
+      <el-switch v-model="optionModel.widgetShowRuleEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显隐规则设置')">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+        <span>{{ optionModel.widgetShowRuleConfig && optionModel.widgetShowRuleConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top"></el-divider>
+    </el-form-item>
+    <el-dialog
+      v-if="dialogVisible"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('显隐规则设置')"
+      :visible.sync="dialogVisible"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="tableData"
+          height="100%"
+          border=""
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('服务类型')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
+                <el-option :value="5" label="默认"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('服务名称')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input v-model="row.companyCodes" clearable :disabled="row.serveType==5"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('角色编码')" width="250">
+            <template slot-scope="{row}">
+              <el-input v-model="row.roleCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('设置')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type">
+                <el-option :value="1" label="显示"></el-option>
+                <el-option :value="2" label="隐藏"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="addItem"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="tableData.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="colSubmit" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+
+export default {
+  name: "widgetShowRuleFlag-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableData: [],
+    }
+  },
+  methods: {
+    openDialog() {
+      let tableData = this.optionModel.widgetShowRuleConfig || [];
+      this.dialogVisible = true;
+      this.tableData = this.$baseLodash.cloneDeep(tableData)
+    },
+    addItem() {
+      let newItem = {
+        type: 1,
+        serveType: 3,
+        serveName: "dev",
+        roleCodes: null,
+        companyCodes: null
+      }
+      this.tableData.push(newItem);
+    },
+    colSubmit() {
+
+      /*if(this.tableData.some(item=>!item.roleCodes)){
+        this.$message({
+          type:"error",
+          content:"角色编码不能为空"
+        })
+        return
+      }*/
+
+      let searveNameList = ["prod", "uat", "dev"];
+      let tableData = this.tableData;
+      let map = {}
+      for (let i = 0; i < tableData.length; i++) {
+        let item = tableData[i];
+        if (!item.roleCodes) {
+          this.$message({
+            type: "error",
+            message: "角色编码不能为空"
+          })
+          return
+        }
+        if (item.serveType === 4) {
+          if (!item.serveName) {
+            this.$message({
+              type: "error",
+              message: "自定义服务的服务名称不能为空"
+            })
+            return
+          } else if(searveNameList.includes(item.serveName)){
+            this.$message({
+              type: "error",
+              message: "自定义服务的服务名称不能为`prod,uat,dev`"
+            })
+            return
+          }
+        }
+        let serveName = item.serveName || "";
+        if (item.serveType === 5) serveName = "_all";
+        let companyCodes = item.companyCodes || "";
+        let key = serveName + "_" + companyCodes;
+        if (!map[key]) {
+          map[key] = true;
+        } else {
+          this.$message({
+            type: "error",
+            message: "[服务+组织]不能重复"
+          })
+          return
+        }
+      }
+
+      this.dialogVisible = !1;
+      this.optionModel.widgetShowRuleConfig = this.tableData;
+    },
+    changeServeType(row) {
+      // modelKey
+      let map = {
+        1: "prod",
+        2: "uat",
+        3: "dev"
+      }
+      let serveName = null;
+      let serveType = row.serveType;
+      if (serveType && map[serveType]) {
+        serveName = map[row.serveType];
+      }
+      if (serveType === 5) {
+        row.companyCodes = null
+      }
+      row.serveName = serveName;
+    },
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -109,6 +109,7 @@ const COMMON_PROPERTIES = {
   'formScriptEnabled': 'formScriptEnabled-editor',
   'textFlag': 'textFlag-editor',
   'showRuleFlag': 'showRuleFlag-editor',
+  'widgetShowRuleFlag': 'widgetShowRuleFlag-editor',
 
   //弹框
   title: "title-editor",

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -794,6 +794,12 @@ export const defaultTextFlagConfig = {
   widgetTextLinkConfig: null
 }
 
+export const defaultWidgetShowRuleConfig = {
+  widgetShowRuleFlag: 1,
+  widgetShowRuleEnabled: false,
+  widgetShowRuleConfig: [],
+}
+
 export const basicFields = [
   {
     type: "input",
@@ -1686,6 +1692,7 @@ export const basicFields = [
         tableData: {}
       },
       ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1843,6 +1850,7 @@ export const basicFields = [
       onClick: "",
       accessType: "1",
       ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1886,6 +1894,7 @@ export const basicFields = [
         tableData: {}
       },
       ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2647,7 +2656,7 @@ export const advancedFields = [
         tableEnabled: true
       },
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2685,6 +2694,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
       hiddenByWf: true,
 
       showRuleFlag: 1,
@@ -2723,7 +2733,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2750,7 +2760,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2786,7 +2796,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2821,7 +2831,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       importFileLimitSize: 200,
       importEntity: '',
       importAttachCode: '',
@@ -2865,7 +2875,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
-
+      ...defaultWidgetShowRuleConfig,
       frontImportFlag: 1,
       importFileLimitSize: 200,
       importAttachCode: '',
@@ -2906,6 +2916,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
       printTableRef: "",
       printItems: [],