cloud-web-corejs 1.0.54-dev.24 → 1.0.54-dev.241

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

@@ -0,0 +1,265 @@
+<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,$index}">
+              <el-input
+                class="search-input"
+                max="200"
+                v-model="row.companyCodes"
+                @clear="clearBdCompanyEnv(row)"
+                v-el-readonly
+                clearable
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search" @click="openBdCompanyEnvDialog($index)"></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('服务名称')" width="150">
+            <template slot-scope="{row}">
+              {{row.serveName}}
+            </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>
+    <bdCompanyEnvDialog v-if="showBdCompanyEnvDialog" :visiable.sync="showBdCompanyEnvDialog"
+      @confirm="confirmBdCompanyEnvDialog" :multi="false"/>
+  </div>
+</template>
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+import bdCompanyEnvDialog from "@/views/bd/setting/bd_company_env/dialog"
+
+export default {
+  name: "widgetShowRuleFlag-editor",
+  components: {bdCompanyEnvDialog},
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      tableData: [],
+      showBdCompanyEnvDialog:false
+    }
+  },
+  methods: {
+    openDialog() {
+      let tableData = this.optionModel.widgetShowRuleConfig || [];
+      this.dialogVisible = true;
+      this.tableData = this.$baseLodash.cloneDeep(tableData)
+    },
+    addItem() {
+      let newItem = {
+        type: 1,
+        serveType: 3,
+        serveName: null,
+        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;
+    },
+
+    clearBdCompanyEnv(row){
+      row.serveName = null;
+      row.companyCodes = null;
+    },
+    openBdCompanyEnvDialog(rowIndex){
+      this.operateIndex = rowIndex;
+      this.showBdCompanyEnvDialog = true;
+    },
+    confirmBdCompanyEnvDialog(rows) {
+      if(rows.length){
+        let row = rows[0];
+        let item = this.tableData[this.operateIndex]
+        item.serveName = row.bdService;
+        item.companyCodes = row.bdCompanyCode;
+      }
+    }
+
+  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -12,6 +12,7 @@ const COMMON_PROPERTIES = {
   'formField': 'formField-editor',
   // 'labelAlign': 'labelAlign-editor',
   'type': 'type-editor',
+  'buttonTypeFlag': 'button-type-editor',
   'defaultValue': 'defaultValue-editor',
   'placeholder': 'placeholder-editor',
   'startPlaceholder': 'startPlaceholder-editor',
@@ -42,6 +43,7 @@ const COMMON_PROPERTIES = {
   'htmlContent': 'htmlContent-editor',
   'format': 'format-editor',
   'valueFormat': 'valueFormat-editor',
+  'defaultTime': 'defaultTime-editor',
   'filterable': 'filterable-editor',
   'allowCreate': 'allowCreate-editor',
   'remote': 'remote-editor',
@@ -107,6 +109,10 @@ const COMMON_PROPERTIES = {
   'formScriptEnabled': 'formScriptEnabled-editor',
   'textFlag': 'textFlag-editor',
   'showRuleFlag': 'showRuleFlag-editor',
+  'widgetShowRuleFlag': 'widgetShowRuleFlag-editor',
+
+  'dropdownMenuFlag': 'dropdown-menu-editor',
+  'dropdownItemFlag': 'dropdown-item-editor',
 
   //弹框
   title: "title-editor",
@@ -139,6 +145,7 @@ const COMMON_PROPERTIES = {
 
   tableExportParam: "table-export-button-editor",
   importEntity: "import-button-editor",
+  frontImportFlag: "import2-button-editor",
   printTableRef: "print-button-editor",
   statusParam: "field-status-editor",
   // searchDialogEventEnabled: "search-dialog-event-editor"
@@ -147,6 +154,9 @@ const COMMON_PROPERTIES = {
   "submitFlag": "submitFlag-editor",
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",
+  "tagFormCode": "project-tag-editor",
+  "autoValueEnabled": "autoValueEnabled-editor",
+  // "commonAttributeEnabled": "commonAttributeEnabled-editor"
 }
 
 const ADVANCED_PROPERTIES = {
@@ -178,12 +188,12 @@ const ADVANCED_PROPERTIES = {
   'round': 'round-editor',
   'circle': 'circle-editor',
   'icon': 'icon-editor',
-  'labelIconClass': 'labelIconClass-editor',
-  'labelIconPosition': 'labelIconPosition-editor',
-  'labelTooltip': 'labelTooltip-editor',
-  'appendButton': 'appendButton-editor',
-  'appendButtonDisabled': 'appendButtonDisabled-editor',
-  'buttonIcon': 'buttonIcon-editor',
+  // 'labelIconClass': 'labelIconClass-editor',
+  // 'labelIconPosition': 'labelIconPosition-editor',
+  // 'labelTooltip': 'labelTooltip-editor',
+  // 'appendButton': 'appendButton-editor',
+  // 'appendButtonDisabled': 'appendButtonDisabled-editor',
+  // 'buttonIcon': 'buttonIcon-editor',
 
 
 }
@@ -212,6 +222,7 @@ const EVENT_PROPERTIES = {
   'onAppendButtonClick': 'onAppendButtonClick-editor',
   'onSearchConfirm': 'onSearchConfirm-editor',
   'onSearchClear': 'onSearchClear-editor',
+  'onAfterConfirmFile': 'onAfterConfirmFile-editor',
 
   //容器
   'onSubFormRowAdd': 'onSubFormRowAdd-editor',

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="toolbar-container">
     <div class="left-toolbar">
-      <!--       <el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory"><svg-icon icon-class="undo" /></el-button>
-            <el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory"><svg-icon icon-class="redo" /></el-button>-->
+      <el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory">
+        <svg-icon icon-class="undo"/>
+      </el-button>
+      <el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory">
+        <svg-icon icon-class="redo"/>
+      </el-button>
       <el-button-group>
-        <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
+<!--        <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
           {{ i18nt('designer.toolbar.pcLayout') }}
-        </el-button>
+        </el-button>-->
         <!--         <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
         <!--        <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
                   {{ i18nt('designer.toolbar.mobileLayout') }}
@@ -43,12 +47,12 @@
                   表单/列表设置
                 </el-button>-->
         <el-button type="primary" @click="saveReportTemplate()" plain
-                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1">
+                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1 && !readonly">
           <i class="el-icon-check"/>
           保存
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('clearDesignerButton')" type="text" @click="clearFormWidget">
+        <el-button v-if="showToolButton('clearDesignerButton') && !readonly" type="text" @click="clearFormWidget">
           <i class="el-icon-delete"/>
           {{ i18nt('designer.toolbar.clear') }}
         </el-button>
@@ -57,7 +61,7 @@
           {{ i18nt('designer.toolbar.preview') }}
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('importJsonButton')" type="text" @click="importJson">
+        <el-button v-if="showToolButton('importJsonButton') && !readonly" type="text" @click="importJson">
           {{ i18nt('designer.toolbar.importJson') }}
         </el-button>
         <el-button v-if="showToolButton('exportJsonButton')" type="text" @click="exportJson">
@@ -424,19 +428,16 @@
 
 <script>
 import VFormRender from '../../../../components/xform/form-render/index';
-import Clipboard from 'clipboard';
 import indexMixin from './indexMixin.js';
 import FormSetting from '../../../../components/xform/form-designer/setting-panel/form-setting';
-import tableForm from "../../../../components/table/tableForm.vue";
 
 export default {
   name: 'ToolbarPanel',
   components: {
-    tableForm,
     VFormRender,
-    Clipboard,
     FormSetting
   },
+  inject:["readonly"],
   mixins: [indexMixin],
   data() {
     return {