cloud-web-corejs 1.0.79 → 1.0.81

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

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-form-item :label="i18nt('启用流程')">
+<!--    <el-form-item :label="i18nt('启用流程')">
       <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>
+    </el-form-item>-->
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-offset-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colOffsetTitle')">
-    <el-input-number v-model.number="optionModel.offset" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.offset" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-pull-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPullTitle')">
-    <el-input-number v-model.number="optionModel.pull" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.pull" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-push-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPushTitle')">
-    <el-input-number v-model.number="optionModel.push" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.push" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

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

@@ -58,7 +58,7 @@
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
       top="5vh"
-      width="500px"
+      width="600px"
       v-dialog-drag
     >
       <div class="cont">
@@ -76,6 +76,11 @@
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
+          <el-table-column label="目标数据属性名称" width="150" prop="targetField">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.targetFormField"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column label="来源字段" width="150" prop="sourceField">
             <template slot-scope="scope">
               <el-input v-model="scope.row.sourceField"></el-input>
@@ -114,6 +119,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
+        <span class="fl tips">注：'目标字段'与'目标数据属性名称'只需要维护一个即可。</span>
         <el-button @click="showDialog=false" class="button-sty" icon="el-icon-close">
           {{ i18nt('designer.hint.cancel') }}
         </el-button>

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form-item label-width="0">
-      <el-divider class="custom-divider">导入设置</el-divider>
+      <el-divider class="custom-divider">后端导入设置</el-divider>
     </el-form-item>
     <el-form-item label="导入数据表名">
       <el-input v-model="optionModel.importEntity"></el-input>
@@ -19,18 +19,15 @@
         <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
       </el-input>
     </el-form-item>
-    <el-form-item label="执行后台脚本编码">
-      <el-input v-model="optionModel.importScriptCode"></el-input>
-    </el-form-item>
     <el-form-item label="关联表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
+    <el-form-item label="执行后台脚本编码">
+      <el-input v-model="optionModel.importScriptCode"></el-input>
+    </el-form-item>
     <el-form-item label="启用图片处理">
       <el-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
     </el-form-item>
-<!--    <el-form-item label="图片处理脚本编码">
-      <el-input v-model="optionModel.importPreScriptCode"></el-input>
-    </el-form-item>-->
     <el-form-item label="导入前数据处理" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
@@ -38,6 +35,15 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+
+    <el-form-item label="导入完成回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
   </div>
@@ -62,7 +68,9 @@ export default {
     return {
       eventParams: [],
       showBdAttachSettingDialog: false,
-      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done']
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
     };
   },
   methods: {

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

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">前端导入设置</el-divider>
+    </el-form-item>
+    <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-input
+        class="search-input"
+        max="200"
+        v-model="optionModel.importAttachCode"
+        clearable
+      >
+        <i slot="suffix" class="el-input__icon el-icon-search" @click="showBdAttachSettingDialog = true"></i>
+      </el-input>
+    </el-form-item>
+    <el-form-item label="关联表格唯一名称">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="启用确认回调">
+      <el-switch v-model="optionModel.onConfirmImportEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.onConfirmImportEnabled">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onConfirmImport', onConfirmImportParams)">
+        <span>{{ optionModel.onConfirmImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="导入完成回调" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('onSuccessImport', onSuccessImportParams)">
+        <span>{{ optionModel.onSuccessImport }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
+    <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
+                           @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import bdAttachSettingDialog from "../../../../../../views/bd/setting/bd_attach_setting/dialog.vue";
+
+export default {
+  name: "import2-button-editor",
+  components: {bdAttachSettingDialog},
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+      showBdAttachSettingDialog: false,
+      onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
+    };
+  },
+  methods: {
+    confirmBdAttachSettingDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        this.optionModel.importAttachCode = row.code;
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-rate/rate-defaultValue-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-input-number v-model="optionModel.defaultValue" :min="0" :max="optionModel.max" style="width: 100%"
+    <el-input-number v-model="optionModel.defaultValue" :max="optionModel.max" style="width: 100%"
                      @change="emitDefaultValueChange">
     </el-input-number>
   </el-form-item>

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

@@ -1,5 +1,34 @@
 <template>
-  <div></div>
+  <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.hideFileInfo"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('隐藏文件名')">
+      <el-switch v-model="optionModel.hideFileName"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示文件大小')">
+      <el-switch v-model="optionModel.showFileSize"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示创建人')">
+      <el-switch v-model="optionModel.showFileCreateBy"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示创建时间')">
+      <el-switch v-model="optionModel.showFileCreateDate"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('缩略图大小')">
+      <el-select v-model="optionModel.fileShowImageSize">
+        <el-option :value="1" label="1"></el-option>
+        <el-option :value="2" label="2"></el-option>
+        <el-option :value="3" label="3"></el-option>
+        <el-option :value="4" label="4"></el-option>
+        <el-option :value="5" label="5"></el-option>
+      </el-select>
+    </el-form-item>
+
+  </div>
 </template>
 
 <script>

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

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.limit')">
-    <el-input-number v-model="optionModel.limit" :min="1" class="hide-spin-button" style="width: 100%"></el-input-number>
+    <el-input-number v-model="optionModel.limit" class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>
 

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

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.multipleLimit')">
-    <el-input-number v-model="optionModel.multipleLimit" :min="0"
+    <el-input-number v-model="optionModel.multipleLimit"
                      class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

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

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.precision')">
-    <el-input-number v-model="optionModel.precision" :min="0" class="hide-spin-button" style="width: 100%"></el-input-number>
+    <el-input-number v-model="optionModel.precision" class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>
 

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

@@ -1,26 +1,148 @@
 <template>
-  <div v-show="false">
+  <div v-show="true">
     <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top">文本显示设置</el-divider>
+      <el-divider class="custom-divider-margin-top">显示设置</el-divider>
     </el-form-item>
-    <el-form-item :label="i18nt('全部显示为*')">
-      <el-switch v-model="optionModel.textRule1" @change="changeTextRule1"></el-switch>
+    <el-form-item :label="i18nt('仅显示明文文本')">
+      <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('前面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule2" @change="changeTextRule2"></el-switch>
+    <el-form-item :label="i18nt('仅显示密文文本')">
+      <el-switch v-model="optionModel.showEncryptTextEnabled" @change="optionModel.showTextEnabled=false"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('前面明文位数')">
-      <base-input-number v-model="optionModel.textRule2Number" :scale="0"></base-input-number>
+    <el-form-item :label="i18nt('启用特定用户显示规则设置')">
+      <el-switch v-model="optionModel.userTextRuleEnabled"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('后面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule3" @change="changeTextRule3"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('后面明文位数')">
-      <base-input-number v-model="optionModel.textRule3Number" :scale="0"></base-input-number>
-    </el-form-item>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top"></el-divider>
+    <el-form-item :label="i18nt('特定用户显示规则设置')" v-if="optionModel.userTextRuleEnabled">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+        <span>{{ optionModel.userTextRuleConfig && optionModel.userTextRuleConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
     </el-form-item>
+    <template v-if="optionModel.showEncryptTextEnabled || optionModel.userTextRuleEnabled">
+      <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.textRule1" @change="changeTextRule1"
+                   :disabled="optionModel.textRule1 && !optionModel.textRule2 && !optionModel.textRule3"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('前面明文，其他为*')">
+        <el-switch v-model="optionModel.textRule2" @change="changeTextRule2"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('前面明文位数')">
+        <base-input-number v-model="optionModel.textRule2Number" :scale="0"></base-input-number>
+      </el-form-item>
+      <el-form-item :label="i18nt('后面明文，其他为*')">
+        <el-switch v-model="optionModel.textRule3" @change="changeTextRule3"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('后面明文位数')">
+        <base-input-number v-model="optionModel.textRule3Number" :scale="0"></base-input-number>
+      </el-form-item>
+      <el-form-item label-width="0">
+        <el-divider class="custom-divider-margin-top"></el-divider>
+      </el-form-item>
+    </template>
+    <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=""
+          row-key="columnId"
+          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-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></el-input>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('登录名')" width="150">
+                      <template slot-scope="{row}">
+                        <el-input v-model="row.loginAccounts" clearable></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-input v-model="row.saleOrgCodes" clearable></el-input>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('设置')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type" clearable>
+                <el-option :value="1" label="明文文本显示"></el-option>
+                <el-option :value="2" label="密文文本显示"></el-option>
+                <el-option :value="0" 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>
 
@@ -37,7 +159,8 @@ export default {
   },
   data() {
     return {
-
+      dialogVisible: false,
+      tableData: [],
     }
   },
   methods: {
@@ -46,13 +169,40 @@ export default {
       this.optionModel.textRule3 = false;
       this.optionModel.textRule2Number = null;
       this.optionModel.textRule3Number = null;
+      this.$forceUpdate()
     },
     changeTextRule2(val) {
-      this.optionModel.textRule1 = false;
+      let textRule1 = !this.optionModel.textRule2 && !this.optionModel.textRule3;
+      this.optionModel.textRule1 = textRule1;
+      this.$forceUpdate()
     },
     changeTextRule3(val) {
-      this.optionModel.textRule1 = false;
-    }
+      let textRule1 = !this.optionModel.textRule2 && !this.optionModel.textRule3;
+      this.optionModel.textRule1 = textRule1;
+      this.$forceUpdate()
+    },
+    openDialog() {
+      let userTextRuleConfig = this.optionModel.userTextRuleConfig || [];
+      this.tableData = this.$baseLodash.cloneDeep(userTextRuleConfig)
+      this.dialogVisible = true;
+
+    },
+    addItem() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        // loginAccounts: null,
+        roleCodes: null,
+        // saleOrgCodes: null,
+        companyCodes: null
+      }
+      this.tableData.push(newItem);
+    },
+    colSubmit() {
+      this.dialogVisible = !1;
+      this.optionModel.userTextRuleConfig = this.tableData;
+    },
   }
 }
 </script>

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

@@ -140,6 +140,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"
@@ -149,6 +150,7 @@ const COMMON_PROPERTIES = {
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",
   "tagFormCode": "project-tag-editor",
+  "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
 }
 

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

@@ -424,17 +424,13 @@
 
 <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"],