cloud-web-corejs 1.0.54-dev.196 → 1.0.54-dev.198

package/src/components/table/util/index.js

@@ -0,0 +1,328 @@
+import Vue from "vue";
+import CellSlot from "@base/components/table/CellSlot.vue";
+
+let instance = null;
+
+let TempSoltConstructor = Vue.extend(CellSlot);
+
+function initTempSoltConstructorInstance() {
+  if (!instance) {
+    instance = new TempSoltConstructor();
+  }
+  return instance;
+}
+
+function destroyTempSoltConstructorInstance() {
+  if (instance) {
+    instance.$destroy();
+    instance = null;
+  }
+}
+
+export function getCellValue(obj) {
+  let {column, $table} = obj;
+  let params = createParams(obj);
+  let h = $table.$createElement;
+  let that = $table.$xegrid.originOption.vue;
+
+  let cellValue;
+  if (column.slots && column.slots.filterVal) {
+    cellValue = column.slots.filterVal(params);
+  } else {
+    let result = column.renderCell(h, params);
+    cellValue = vNodeRender(result);
+  }
+  return cellValue;
+}
+
+export function createParams(obj) {
+  let $xetable = obj.$table;
+  let {column, row} = obj;
+  let fixedType = $xetable.$refs.tableBody.fixedType,
+    afterFullData = $xetable.afterFullData,
+    tableData = $xetable.tableData;
+  var columnIndex = $xetable.getColumnIndex(column);
+  let items = tableData;
+
+  var _columnIndex = $xetable.getVTColumnIndex(column);
+
+  let overflowX = $xetable.overflowX;
+  var fixedHiddenColumn = fixedType
+    ? column.fixed !== fixedType
+    : column.fixed && overflowX;
+
+  let tableColumn = $xetable.tableColumn,
+    scrollXLoad = $xetable.scrollXLoad,
+    scrollYLoad = $xetable.scrollYLoad,
+    allColumnOverflow = $xetable.showOverflow,
+    isAllOverflow = $xetable.isAllOverflow,
+    mergeList = $xetable.mergeList,
+    spanMethod = $xetable.spanMethod,
+    keyboardConfig = $xetable.keyboardConfig,
+    keyboardOpts = $xetable.keyboardOpts,
+    fixedColumn = $xetable.$refs.tableBody.fixedColumn,
+    visibleColumn = $xetable.visibleColumn;
+
+  if (obj.tableColumn == null) {
+    if (fixedType) {
+      if (
+        scrollXLoad
+        || scrollYLoad
+        || (allColumnOverflow ? isAllOverflow : allColumnOverflow)
+      ) {
+        if (
+          !mergeList.length
+          && !spanMethod
+          && !(keyboardConfig && keyboardOpts.isMerge)
+        ) {
+          tableColumn = fixedColumn;
+        } else {
+          tableColumn = visibleColumn; // 检查固定列是否被合并，合并范围是否超出固定列
+          // if (mergeList.length && !isMergeLeftFixedExceeded && fixedType === 'left') {
+          //   tableColumn = fixedColumn
+          // } else if (mergeList.length && !isMergeRightFixedExceeded && fixedType === 'right') {
+          //   tableColumn = fixedColumn
+          // } else {
+          //   tableColumn = visibleColumn
+          // }
+        }
+      } else {
+        tableColumn = visibleColumn;
+      }
+    }
+  } else {
+    tableColumn = obj.tableColumn;
+  }
+
+  var rowid = $xetable.getRowid(row);
+  let fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
+  var rest = fullAllDataRowIdData[rowid];
+  var rowLevel = rest ? rest.level : 0;
+  var seq = rest ? rest.seq : -1;
+  var renderType = "body";
+
+  let $rowIndex = obj.$rowIndex;
+  if ($rowIndex == null) {
+    tableData.some(function (item, index) {
+      let flag = rowid == $xetable.getRowid(item);
+      if (flag) {
+        $rowIndex = index;
+      }
+      return flag;
+    });
+  }
+
+  let $columnIndex = obj.$columnIndex;
+  if ($columnIndex == null) {
+    tableColumn.some(function (item, index) {
+      let flag = column.id == item.id;
+      if (flag) {
+        $columnIndex = index;
+      }
+      return flag;
+    });
+  }
+
+  var _rowIndex = $xetable.getVTRowIndex(row); // 确保任何情况下 rowIndex 都精准指向真实 data 索引
+  var rowIndex = $xetable.getRowIndex(row); // 事件绑定
+  var params = {
+    $table: $xetable,
+    seq: seq,
+    rowid: rowid,
+    row: row,
+    rowIndex: rowIndex,
+    $rowIndex: $rowIndex,
+    _rowIndex: _rowIndex,
+    column: column,
+    columnIndex: columnIndex,
+    $columnIndex: $columnIndex,
+    _columnIndex: _columnIndex,
+    fixed: fixedType,
+    type: renderType,
+    isHidden: fixedHiddenColumn,
+    level: rowLevel,
+    visibleData: afterFullData,
+    data: tableData,
+    items: items,
+  };
+  return params;
+}
+
+function vNodeRender(vNodes) {
+  if (vNodes === null || vNodes === undefined) {
+    return null;
+  }
+  let type = typeof vNodes;
+  if (type == "string" || type == "number") {
+    return vNodes;
+  }
+
+  let cellValue = "";
+  let contents = [];
+  // let instance = null;
+  let loop = function (item) {
+    if (item && item.children && item.children.length > 0) {
+      let arr = [];
+      item.children.forEach(function (child) {
+        if (child.componentOptions) {
+          initTempSoltConstructorInstance();
+          instance.$slots.default = child;
+          instance.$mount();
+          cellValue = "";
+          if (child.componentInstance && child.componentInstance.$el) {
+            cellValue = domRender(child.componentInstance.$el);
+          }
+          arr.push(cellValue);
+          instance.$slots.default = null;
+        } else {
+          let text = loop(child);
+          if (text != null) {
+            arr.push(text);
+          }
+        }
+      });
+      return arr.join("");
+    } else {
+      if (item.text != null) {
+        return item.text;
+      }
+    }
+  };
+
+  vNodes.forEach(function (vNode) {
+    if (vNode !== undefined && vNode !== null) {
+      if (vNode.componentOptions) {
+        initTempSoltConstructorInstance();
+        instance.$slots.default = vNode;
+        instance.$mount();
+        cellValue = "";
+        if (vNode.componentInstance && vNode.componentInstance.$el) {
+          cellValue = domRender(vNode.componentInstance.$el);
+        }
+        contents.push(cellValue);
+        // instance.$destroy();
+        instance.$slots.default = null;
+        // instance = null;
+      } else {
+        if (vNode && vNode.children && vNode.children.length > 0) {
+          let text = loop(vNode);
+          if (text != null) {
+            contents.push(text);
+          }
+        } else {
+          let type1 = typeof vNode;
+          if (type1 == "string" || type1 == "number") {
+            contents.push(vNode);
+          } else if (vNode.text != null) {
+            contents.push(vNode.text);
+          }
+        }
+      }
+    }
+  });
+  destroyTempSoltConstructorInstance();
+  // instance = null;
+  return contents.join("").trim();
+}
+
+function groupDomRender(dom) {
+  let contents = [];
+  let loop = function (item) {
+    if (item && item.children && item.children.length > 0) {
+      let arr = [];
+      Array.from(item.children).forEach((child) => {
+        let text = loop(child);
+        if (text != null) {
+          arr.push(text);
+        }
+      });
+      return arr.join("");
+    } else {
+      var style = window.getComputedStyle(item); //el即DOM元素
+      let classList = Array.from(item.classList);
+      if (style.display === "none") {
+      } else if (item.nodeName == "INPUT") {
+        if (item.type == "radio") {
+          if (item.checked && classList.includes("el-radio__original")) {
+            let value = item.parentNode.parentNode.innerText || "";
+            if (value) {
+              contents.push(value);
+            }
+          }
+        } else if (item.type == "checkbox") {
+          if (item.checked && classList.includes("el-checkbox__original")) {
+            let value = item.parentNode.parentNode.innerText || "";
+            if (value) {
+              contents.push(value);
+            }
+          }
+        }
+      }
+    }
+  };
+  loop(dom);
+  return contents.join(",");
+}
+
+function selectGroupRender(dom) {
+  let ul = dom.querySelector(".el-select-dropdown__list");
+  if (ul) {
+    let lis = ul.children;
+    if (lis) {
+      return Array.from(lis)
+        .filter((li) => {
+          let classList = Array.from(li.classList);
+          return classList.includes("selected");
+        })
+        .map((li) => {
+          return li.innerText;
+        })
+        .join(",");
+    } else {
+      return "";
+    }
+  } else {
+    return "";
+  }
+}
+
+function domRender(dom) {
+  let loop = function (item) {
+    if(item?.nodeName=="#comment")return "";
+    var style = window.getComputedStyle(item); //el即DOM元素
+    let role = item.getAttribute("role");
+    let classList = Array.from(item.classList);
+
+    if (style.display === "none") {
+      return "";
+    } else if (role == "group") {
+      return groupDomRender(item);
+    } else if (role == "radiogroup") {
+      return groupDomRender(item);
+    } else if (
+      classList.includes("el-select")
+      && item["@@clickoutsideContext"]
+    ) {
+      return selectGroupRender(item);
+    } else if (item && item.children && item.children.length > 0) {
+      let arr = [];
+      Array.from(item.children).forEach((child) => {
+        let text = loop(child);
+        if (text != null) {
+          arr.push(text);
+        }
+      });
+      return arr.join("");
+    } else {
+      if (item.nodeName == "INPUT") {
+        return item.value;
+      } else if (item.innerText != null && item.innerText != "") {
+        return item.innerText;
+      } else {
+        return "";
+      }
+    }
+  };
+  let res = loop(dom).trim();
+  return res;
+}

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

@@ -176,6 +176,9 @@ export default {
     },
 
     labelAlign() {
+      if (!this?.field?.options?.labelAlign) {
+        return ""
+      }
       if (!!this.field.options.labelAlign) {
         return this.field.options.labelAlign
       }
@@ -299,6 +302,7 @@ export default {
       let that = this.$parent
       let formRef = that.getFormRef ? that.getFormRef() : that;
 
+      if(!formRef)return
       //详情页，新增页面不加密
       let fJson = formRef.formJson;
       let formConfig = fJson.formConfig;

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -9,16 +9,20 @@
     <el-form-item label="文件大小限制（M）">
       <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
     </el-form-item>
-    <el-form-item label="选择导入模板文件">
+    <el-form-item label="导入模板文件编码">
       <el-input
         class="search-input"
         max="200"
-        v-model="optionModel.importAttachCode"
+        :value="optionModel.importAttachCode"
         clearable
+        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
       >
         <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
       </el-input>
     </el-form-item>
+        <el-form-item label="导入模板文件名称">
+          <span>{{optionModel.importAttachName}}</span>
+        </el-form-item>
     <el-form-item label="关联表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
@@ -77,6 +81,7 @@ export default {
     confirmBdAttachSettingDialog(rows) {
       if (rows.length) {
         let row = rows[0];
+        this.optionModel.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
     }

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -6,16 +6,21 @@
     <el-form-item label="文件大小限制（M）">
       <base-input-number v-model="optionModel.importFileLimitSize" :max="200"></base-input-number>
     </el-form-item>
-    <el-form-item label="选择导入模板文件">
+    <el-form-item label="导入模板文件编码">
       <el-input
         class="search-input"
         max="200"
-        v-model="optionModel.importAttachCode"
+        :value="optionModel.importAttachCode"
         clearable
+        @clear="optionModel.importAttachCode=null;optionModel.importAttachName=null;"
       >
         <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
       </el-input>
     </el-form-item>
+    <el-form-item label="导入模板文件名称">
+      <span>{{ optionModel.importAttachName }}</span>
+    </el-form-item>
+
     <el-form-item label="关联表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
@@ -70,6 +75,7 @@ export default {
     confirmBdAttachSettingDialog(rows) {
       if (rows.length) {
         let row = rows[0];
+        this.optionModel.importAttachName = row.name;
         this.optionModel.importAttachCode = row.code;
       }
     }

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

@@ -1781,6 +1781,7 @@ export const basicFields = [
         tableData: {}
       },
       ...defaultWfConfig,
+      hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
 
       showRuleFlag: 1,
@@ -2865,6 +2866,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+      hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2900,10 +2902,12 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+      hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
       importFileLimitSize: 200,
       importEntity: '',
       importAttachCode: '',
+      importAttachName: '',
       importScriptCode: '',
       onBeforeImport: '',
       enabledImportPreHandle: false,
@@ -2944,10 +2948,12 @@ export const advancedFields = [
         ...defaultSearchDialogConfig
       },
       ...defaultWfConfig,
+      hiddenByWf: true,
       ...defaultWidgetShowRuleConfig,
       frontImportFlag: 1,
       importFileLimitSize: 200,
       importAttachCode: '',
+      importAttachName: '',
       tableRef: '',
       onConfirmImportEnabled: false,
       onConfirmImport: '',

package/src/layout/components/AppMain.vue

@@ -20,12 +20,15 @@
       ></outLink>
     </template>
     <unreadDialog></unreadDialog>
+    <watermark></watermark>
   </section>
 </template>
 
 <script>
 import outLink from '@base/views/user/outLink/index.vue';
 import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+
 
 export default {
   name: 'AppMain',
@@ -43,7 +46,8 @@ export default {
   },
   components: {
     outLink,
-    unreadDialog
+    unreadDialog,
+    watermark
   },
   data() {
     return {

package/src/layout/components/watermark/index.vue

@@ -0,0 +1,77 @@
+<template>
+    <div class="watermarkFlag" :style="'background:url('+imgUrl+')'"></div>
+</template>
+<script>
+import {
+  getParameterVauleByCode,
+} from '@base/api/user'
+
+export default {
+  data() {
+    return {
+      imgUrl: null,
+    }
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    init() {
+      getParameterVauleByCode({
+        data: {"code": "showWatermark"},
+        success: res => {
+          let value = (!res.objx || !res.objx.value) ? "0" : res.objx.value;
+          if (value == "1") {
+            this.watermarkImg();
+          }
+        }
+      })
+    },
+    watermarkImg() {
+      let that = this
+      const testName = this.$store.getters.nickName
+      var nameL = ''
+      if (testName.match(/[^\x00-\xff]/ig) != null){
+        nameL  = testName.length
+      }else{
+        nameL  = testName.length / 2
+      }
+      // 通过canvas将文本生成图片
+      const canvas = document.createElement('canvas')
+      canvas.width = nameL * 32 * 2
+      canvas.height = nameL * 32
+      const ctx = canvas.getContext('2d')
+
+      ctx.font = '18px PingFangSC'
+      ctx.textAlign = 'center'
+      ctx.fillStyle = '#EEEEEE'
+      // 设置倾斜角度
+      ctx.rotate(-30 * Math.PI / 180)
+      // 调整偏移量，让文本完整显示
+      ctx.translate(-50, 30)
+      ctx.fillText(testName, 100, 58)
+      // 将canvas转为base64图片
+      const url = canvas.toDataURL()
+      that.imgUrl = url
+      console.log(that.imgUrl)
+    }
+  }
+}
+</script>
+<style scoped>
+.watermarkFlag {
+  /* 设置全屏宽高，覆盖于页面上方 */
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 100vh;
+  width: 100vw;
+  opacity: 0.8;
+  /* 生成的图片是有一张，开启repeat自动填充 */
+  background: repeat;
+  pointer-events: none;
+  /* 核心部分，决定水印层与内容部分的结合方式 */
+  mix-blend-mode: multiply;
+  z-index: 9999999;
+}
+</style>

package/src/views/bd/setting/bd_attach_setting/edit.vue

@@ -92,11 +92,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ bdAttachSetting.createBy }}</td>
+              <td>{{ bdAttachSetting._createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ bdAttachSetting.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ bdAttachSetting.modifyBy }}</td>
+              <td>{{ bdAttachSetting._modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ bdAttachSetting.modifyDate }}</td>
             </tr>