cloud-web-corejs 1.0.54-dev.290 → 1.0.54-dev.292

package/package.json

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

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

@@ -21,6 +21,9 @@ function destroyTempSoltConstructorInstance() {
 
 export function getCellValue(obj) {
   let {column, $table} = obj;
+  if(column.title=="备注"){
+    debugger
+  }
   let params = createParams(obj);
   let h = $table.$createElement;
   let that = $table.$xegrid.originOption.vue;
@@ -314,7 +317,7 @@ function domRender(dom) {
       });
       return arr.join("");
     } else {
-      if (item.nodeName == "INPUT") {
+      if (item.nodeName == "INPUT" || item.nodeName == "TEXTAREA") {
         return item.value;
       } else if (item.innerText != null && item.innerText != "") {
         return item.innerText;

package/src/components/tempStorage/index.vue

@@ -1,11 +1,11 @@
 <template>
   <span class="button-sty">
-      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain>暂存</el-button>
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain :disabled="disabled">暂存</el-button>
       <el-tooltip class="item" effect="dark" content="查看暂存数据" placement="top">
-        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" ></el-button>
+        <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success" :disabled="disabled"></el-button>
       </el-tooltip>
 
-      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog" 
+      <tempStorageDialog v-if="showTempStorageDialog" :visiable.sync="showTempStorageDialog"
                          @confirm="confirmTempStorageDialog" :storageType="storageType" multi="false"/>
     <el-dialog
       v-if="showSubmitDialog"
@@ -54,7 +54,8 @@ import tempStorageDialog from "./tempStorageDialog.vue";
 
 export default {
   props: {
-    option: Object
+    option: Object,
+    disabled: Boolean,
   },
   components: {
     tempStorageDialog

package/src/components/tempStorage/tempStorageDialog.vue

@@ -60,7 +60,7 @@
       <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
         class="allDel icon-quanbushanchu" @click="clearChecked()"></a></el-tooltip>
       <div class="list">
-        <div class="item" v-for="(checkRow, index) in checkRows">
+        <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
           <p>{{ checkRow.storageCode }}</p>
           <a class="el-icon-close" @click="clearTable1Select(index)"></a>
         </div>

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

@@ -76,7 +76,8 @@ export default {
       return !!this.field.options.customClass ? this.field.options.customClass.join(' ') : ''
     },
     computedStyle() {
-      return {display: this.displayStyle, height: this.heightStyle};
+      let displayStyle = !this.designState && this.field.options.hidden ? "none !important":this.displayStyle
+      return {display: displayStyle, height: this.heightStyle};
     },
     isShow() {
       let result = !this.field.options.hidden || (this.designState === true);

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

@@ -0,0 +1,125 @@
+<template>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <span class="button-sty" v-if="designState">
+      <el-button type="success" class="btn-connect" icon="iconfont icon-zancun" @click="openSubmitDialog" plain >暂存</el-button>
+      <el-button class="btn-connect" @click="openTempStorageDialog" icon="iconfont icon-chakanshuju" type="success"></el-button>
+    </span>
+    <temp-storage-button
+      v-else
+      :option="tempStorageOption"
+      :disabled="!designState && field.options.disabled"
+    ></temp-storage-button>
+  </static-content-wrapper>
+</template>
+
+<script>
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import tempStorageButton from "@base/components/tempStorage/index.vue";
+
+export default {
+  name: "tempStorage-widget",
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
+    },
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
+    },
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
+    },
+  },
+  components: {
+    StaticContentWrapper,
+    tempStorageButton,
+  },
+  computed: {},
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  data() {
+    return {
+      tempStorageOption: {},
+    };
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+         需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+    this.init();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    init() {
+      if (this.designer) return;
+      let dataId = this.getFormRef().dataId;
+      if (dataId) {
+        this.setHidden(true);
+      }
+
+      this.initConfig();
+    },
+    initConfig(){
+      let formCode = this.getFormRef()?.reportTemplate?.formCode;
+      let tempStorageCode = this.field.options.tempStorageCode || formCode;
+      this.tempStorageOption = {
+        storageType: tempStorageCode,
+        data: () => {
+          return this.formModel;
+        },
+        chooseConfirm: (tempStorageData) => {
+          this.getFormRef().setFormData(tempStorageData);
+        },
+        saveConfirm: () => {},
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>

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

@@ -0,0 +1,23 @@
+<template>
+  <el-form-item :label="i18nt('暂存唯一编码')">
+    <el-input type="text" v-model="optionModel.tempStorageCode" placeholder="默认表单模板编码"></el-input>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n";
+
+  export default {
+    name: "tempStorage-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

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

@@ -81,6 +81,7 @@ const COMMON_PROPERTIES = {
   'echarCategoryOption': 'echart-category-editor', //折线图
   'vabSearchName': 'vabSearchName-editor',
   'copyButton': 'copyButton-editor',
+  "tempStorageFlag": "tempStorage-editor",
 
   //容器
   'showBlankRow': 'showBlankRow-editor',

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

@@ -3601,6 +3601,31 @@ export const businessFields = [
       ...defaultWidgetShowRuleConfig,
       hiddenByWf: true,
 
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+    },
+  },
+  {
+    type: "tempStorage",
+    icon: "uploadbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !0,
+    options: {
+      name: "",
+      // label: "暂存",
+      columnWidth: "200px",
+      disabled: !1,
+      hidden: !1,
+
+      tempStorageFlag:1,
+      tempStorageCode:null,
+
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],