cloud-web-corejs 1.0.54-dev.163 → 1.0.54-dev.165

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

@@ -62,6 +62,9 @@ export default {
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
+    },
+    'option':function(){
+
     }
   },
   computed: {

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

@@ -5,7 +5,7 @@
     <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
                :plain="field.options.plain" :round="field.options.round"
                :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="field.options.disabled"
+               :disabled="!designState &&field.options.disabled"
                @click.native="handleButtonWidgetClick">
       {{ getI18nLabel(field.options.label)}}</el-button>
   </static-content-wrapper>

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

@@ -6,12 +6,12 @@
                        :disabled="field.options.disabled" :size="field.options.size"
                        @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-checkbox-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-checkbox-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                             :disabled="item.disabled" :border="field.options.border"
                             :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-checkbox-button>
       </template>
       <template v-else>
-        <el-checkbox v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
+        <el-checkbox v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                      :disabled="item.disabled" :border="field.options.border"
                      :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-checkbox>
       </template>
@@ -73,6 +73,9 @@
       valueField(){
         return this.field.options.valueKey || "value";
       },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -134,7 +134,7 @@ modules = {
       if (null === this.fieldModel) return "--";
       var t = "--";
       return (
-        this.field.options.optionItems.forEach(function (i) {
+        this.getOptionItems().forEach(function (i) {
           (i.value !== e.fieldModel &&
             -1 === e.findInArray(e.fieldModel, i.value)) ||
           (t = "--" === t ? i.label : t + " " + i.label);
@@ -467,6 +467,10 @@ modules = {
           : delete this.refList[e];
       }
     },
+    getOptionKey(){
+      let key =  +"optionItems-"+ this.field.options.name
+      return key;
+    },
     async initOptionItems(keepSelected) {
       var t = this;
       if (this.designState) {
@@ -483,7 +487,17 @@ modules = {
         let formCode = reportTemplate.formCode;
         let formScriptEnabled = this.field.options.formScriptEnabled || false;
         let scriptCode = this.field.options.formScriptCode || "getList";
+        let tableParam = this.tableParam;
         if (formScriptEnabled) {
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = null
+          }
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
@@ -510,6 +524,15 @@ modules = {
         } else if (this.field.options.commonAttributeEnabled) {
           let commonAttributeCode = this.field.options.commonAttributeCode;
           if (!commonAttributeCode) return;
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = null
+          }
           this.$getBaseDicts({
             code: commonAttributeCode,
             success: ({dicts, dictMap}) => {
@@ -521,6 +544,16 @@ modules = {
               );
             },
           });
+        }else{
+          if(tableParam){
+            // tableParam.column.params.optionItems
+            let key =  this.getOptionKey();
+            let optionItems = tableParam.column.params[key];
+            if(optionItems!==undefined){
+              return
+            }
+            tableParam.column.params[key] = this.$baseLodash.cloneDeep(this.field.options.optionItems);
+          }
         }
 
         return;
@@ -1086,12 +1119,19 @@ modules = {
         : (this.fieldModel = ""));
     },
     loadOptions: function (e) {
-      this.field.options.optionItems = baseRefUtil.translateOptionItems(
+      let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
         this.field.options.labelKey || "label",
         this.field.options.valueKey || "value"
       );
+      this.field.options.optionItems = optionItems
+      let tableParam = this.tableParam;
+      if(tableParam){
+        let key =  this.getOptionKey()
+        tableParam.column.params[key] = optionItems;
+        // tableParam.column.params.optionItems = optionItems;
+      }
     },
     reloadOptions: function (e) {
       this.field.options.optionItems = baseRefUtil.translateOptionItems(
@@ -1100,18 +1140,34 @@ modules = {
         this.field.options.labelKey || "label",
         this.field.options.valueKey || "value"
       );
+      let tableParam = this.tableParam;
+      if(tableParam){
+        let key = this.getOptionKey();
+        tableParam.column.params[key] = optionItems;
+        // tableParam.column.params.optionItems = optionItems;
+      }
     },
     getOptions: function () {
-      return this.field.options.optionItems;
+      return this.getOptionItems();
     },
     disableOption: function (e) {
-      this.disableOptionOfList(this.field.options.optionItems, e);
+      this.disableOptionOfList(this.getOptionItems(), e);
     },
     enableOption: function (e) {
-      this.enableOptionOfList(this.field.options.optionItems, e);
+      this.enableOptionOfList(this.getOptionItems(), e);
     },
     getOptionItems: function () {
-      return this.field.options.optionItems;
+      // return this.field.options.optionItems;
+      let tableParam = this.tableParam;
+      let optionItems = this.field.options.optionItems;
+      if(tableParam){
+        let key =  this.getOptionKey();
+        let rows = tableParam.column.params[key];
+        if(rows!==undefined){
+          optionItems = rows || []
+        }
+      }
+      return optionItems;
     },
     setUploadHeader: function (e, t) {
       this.$set(this.uploadHeaders, e, t);

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

@@ -67,7 +67,7 @@ export default {
       // let importCodes = this.field.options.importCodes;
       this.getFormRef().openImportDialog({
         importOption: this.field.options,
-        importSaveDisabled: !!this.field.options.importSaveDisabled,
+        importFrontOnly: !!this.field.options.importFrontOnly,
         callback: (resultData, file, done) => {
           // this.getWidgetRef(tableTarget).searchEvent();
           this.handleCustomEvent(this.field.options.onConfirmImport, ['resultData', 'file', 'done'], [resultData, file, done])

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

@@ -6,12 +6,12 @@
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
                   :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
@@ -73,6 +73,9 @@
       valueField(){
         return this.field.options.valueKey || "value";
       },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -18,7 +18,7 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item[valueField]" :label="getI18nLabel(item[labelField])"
+      <el-option v-for="(item,index) in optionItems" :key="index" :label="getI18nLabel(item[labelField])"
                  :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
@@ -87,6 +87,9 @@ export default {
       let optionItems = this.field.options.optionItems;
       let optionItem = optionItems.find(item => item.value === fieldModel)
       return optionItem && optionItem.label ? optionItem.label : null;
+    },
+    optionItems(){
+      return this.getOptionItems();
     }
 
   },

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

@@ -3,7 +3,10 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">导入设置</el-divider>
     </el-form-item>
-    <el-form-item label="导入数据表名">
+    <el-form-item label="仅导入到前端">
+      <el-switch v-model="optionModel.importFrontOnly"></el-switch>
+    </el-form-item>
+    <el-form-item label="导入数据表名" v-if="!optionModel.importFrontOnly">
       <el-input v-model="optionModel.importEntity"></el-input>
     </el-form-item>
     <el-form-item label="文件大小限制（M）">
@@ -19,36 +22,31 @@
         <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-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)">
-        <span>{{ optionModel.onBeforeImport }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-
-<!--    <el-form-item label="不执行导入后台保存">
-      <el-switch v-model="optionModel.importSaveDisabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="确认回调" label-width="150px">
+    <template v-if="!optionModel.importFrontOnly">
+      <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-switch v-model="optionModel.enabledImportPreHandle"></el-switch>
+      </el-form-item>
+      <el-form-item label="导入前数据处理" label-width="150px">
+        <a href="javascript:void(0);" class="a-link link-oneLind"
+           @click="editEventHandler('onBeforeImport', onBeforeImportParams)">
+          <span>{{ optionModel.onBeforeImport }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+    </template>
+    <el-form-item label="确认回调" label-width="150px" v-if="optionModel.importFrontOnly">
       <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>
 
     <bdAttachSettingDialog v-if="showBdAttachSettingDialog" :visiable.sync="showBdAttachSettingDialog" :multi="false"
                            @confirm="confirmBdAttachSettingDialog"></bdAttachSettingDialog>

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

@@ -2816,7 +2816,7 @@ export const advancedFields = [
       onBeforeImport: '',
       enabledImportPreHandle: false,
 
-      importSaveDisabled: false,
+      importFrontOnly: false,
       onConfirmImport: '',
 
       showRuleFlag: 1,