cloud-web-corejs 1.0.54-dev.336 → 1.0.54-dev.337

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

@@ -1,5 +1,29 @@
 <template>
   <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">选项设置</el-divider>
+    </el-form-item>
+    <el-form-item label="选项值类型">
+      <el-radio-group v-model="optionModel.optionItemValueType" @change="changeValueType">
+        <el-radio :label="0">文本</el-radio>
+        <el-radio :label="1">数值</el-radio>
+        <el-radio :label="2">布尔值</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="默认值">
+        <el-input v-model="optionModel.defaultValue" size="mini" style="width: 100px" v-if="!optionModel.optionItemValueType"></el-input>
+        <base-input-number v-model="optionModel.defaultValue" size="mini" style="width: 100%" v-if="optionModel.optionItemValueType==1" />
+        <el-select v-model="optionModel.defaultValue" style="width: 100%" v-if="optionModel.optionItemValueType===2" clearable @clear="optionModel.defaultValue=null">
+          <el-option :value="true" label="true"></el-option>
+          <el-option :value="false" label="false"></el-option>
+        </el-select>
+    </el-form-item>
+    <el-form-item :label="i18nt('显示字段')" v-if="optionModel.commonAttributeEnabled || optionModel.formScriptEnabled">
+      <el-input type="text" v-model="optionModel.labelKey" placeholder="默认label" :disabled="optionModel.commonAttributeEnabled"></el-input>
+    </el-form-item>
+    <el-form-item :label="i18nt('关联字段')" v-if="optionModel.commonAttributeEnabled || optionModel.formScriptEnabled">
+      <el-input type="text" v-model="optionModel.valueKey" placeholder="默认value" :disabled="optionModel.commonAttributeEnabled"></el-input>
+    </el-form-item>
     <el-form-item label="状态配置">
       <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
         <span>{{ optionModel.statusParam.length ? "已维护" : "" }}</span>
@@ -15,30 +39,12 @@
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
       :destroy-on-close="!0"
-      top="5vh"
-      width="1220px"
+      width="800px"
+      top="0px"
       v-dialog-drag
       @closed="closeHandle"
     >
       <div class="cont">
-        <el-form-item label="选项值类型" style="width: 350px;">
-          <!--          <el-switch v-model="optionItemValueType" @change="changeValueType"></el-switch>-->
-          <el-radio-group v-model="optionItemValueType" @change="changeValueType">
-            <el-radio :label="0">文本</el-radio>
-            <el-radio :label="1">数值</el-radio>
-            <el-radio :label="2">布尔值</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="默认值" style="width: 300px;">
-          <el-input v-model="defaultValue" v-if="!optionItemValueType"></el-input>
-          <base-input-number v-model="defaultValue" ref="defaultNumberInput"
-                             v-if="optionItemValueType==1"/>
-          <el-select v-model="defaultValue" v-if="optionItemValueType===2" clearable
-                     @clear="defaultValue=null">
-            <el-option :value="true" label="true"></el-option>
-            <el-option :value="false" label="false"></el-option>
-          </el-select>
-        </el-form-item>
         <el-table
           ref="singleTable"
           width="100%"
@@ -64,9 +70,9 @@
           </el-table-column>
           <el-table-column label="字段值" width="150" prop="value">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.value" v-if="optionItemValueType===0"></el-input>
-              <base-input-number v-model="scope.row.value" v-if="optionItemValueType===1"></base-input-number>
-              <template v-if="optionItemValueType===2">{{ scope.row.value }}</template>
+              <el-input v-model="scope.row.value" v-if="optionModel.optionItemValueType===0"></el-input>
+              <base-input-number v-model="scope.row.value" v-if="optionModel.optionItemValueType===1"></base-input-number>
+              <template v-if="optionModel.optionItemValueType===2">{{ scope.row.value }}</template>
             </template>
           </el-table-column>
           <el-table-column label="状态颜色" width="100" prop="type">
@@ -181,8 +187,8 @@ export default {
       })
     },
     confirmDialog() {
-      this.optionModel.optionItemValueType = this.optionItemValueType;
-      this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
+      // this.optionModel.optionItemValueType = this.optionItemValueType;
+      // this.optionModel.defaultValue = (this.defaultValue === "" || this.defaultValue === undefined) ? null : this.defaultValue;
       this.optionModel.statusParam = this.$baseLodash.cloneDeep(this.tableData);
       this.showDialog = false;
       this.$nextTick(() => {
@@ -195,23 +201,24 @@ export default {
       this.tableData.splice(rowIndex, 1);
     },
     changeValueType(val) {
-      this.tableData = [];
+      // this.tableData = this.$baseLodash.cloneDeep(this.optionModel.statusParam);
+      this.optionModel.statusParam = [];
       if (val == 2) {
-        this.tableData.push({
+        this.optionModel.statusParam.push({
           label: "是",
           value: true,
           type: "success"
         });
-        this.tableData.push({
+        this.optionModel.statusParam.push({
           label: "否",
           value: false,
           type: "danger"
         });
       }
       if (val == 1) {
-        this.defaultValue = undefined
+        this.optionModel.defaultValue = undefined
       } else {
-        this.defaultValue = null
+        this.optionModel.defaultValue = null
       }
 
     }

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

@@ -29,14 +29,14 @@
       <el-form-item :label="i18nt('词汇编码')" v-if="optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.commonAttributeCode"></el-input>
       </el-form-item>
-      <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
+      <!-- <el-form-item :label="i18nt('显示字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.labelKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
       </el-form-item>
       <el-form-item :label="i18nt('关联字段')" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
         <el-input type="text" v-model="optionModel.valueKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
-      </el-form-item>
+      </el-form-item> -->
     </template>
-    <el-form-item label="查询回调">
+    <el-form-item label="查询回调" v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('formScriptSuccess', ['dataId', 'formCode','res'])">
         <span>{{ optionModel.formScriptSuccess }}</span>
@@ -61,7 +61,7 @@ export default {
   },
   data() {
     return {
-      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census']
+      formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census','status']
     }
   },
   methods: {
@@ -70,20 +70,25 @@ export default {
     },
     changeFormScriptEnabled(val){
       if(val){
-        if(this.optionModel.hasOwnProperty("commonAttributeEnabled")){
-          this.optionModel.commonAttributeEnabled = false
-        }
+        this.optionModel.commonAttributeEnabled = false
       }
+      this.handleLabelAndValueKey();
     },
     changeCommonAttributeEnabled(val){
       if(val){
         this.optionModel.formScriptEnabled = false;
+      }
+      this.handleLabelAndValueKey();
+    },
+    handleLabelAndValueKey(){
+      if(this.optionModel.commonAttributeEnabled){
         this.optionModel.labelKey = "value";
         this.optionModel.valueKey = "sn";
-      }else{
-          this.optionModel.labelKey = null;
-          this.optionModel.valueKey = null;
+      }else {
+        this.optionModel.labelKey = "label";
+        this.optionModel.valueKey = "value";
       }
+
     }
   }
 }

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

@@ -907,6 +907,7 @@ const projectTagConfig = {
 const httpConfig = {
   httpFormCode: null,
   formScriptEnabled: true,
+  commonAttributeEnabled:false,
   formScriptCode: null,
   formScriptParam: null,
   formScriptSuccess: null,
@@ -3240,6 +3241,10 @@ export const advancedFields = [
       optionItemValueType: 0,
       statusType: "common",
       statusParam: [],
+
+      ...httpConfig,
+      formScriptEnabled:false,
+
       onCreated: "",
       onMounted: "",
       ...defaultWfConfig,

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -206,15 +206,18 @@
           </component>
         </template>-->
     <template #widget="obj">
-      <template
-        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]">
+      <template v-if="!!getTableColumnWidget(obj)">
         <template v-if="obj.column.params.widget.type == 'status'">
-          <template
-            v-for="(item,index) in fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].options.statusParam">
-            <span
-              v-if="obj.row[getFieldKeyName(fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id])]===item.value"
-              :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id+'-'+index" class="list-tag"
+          <template v-for="(item,index) in getTableColumnWidget(obj).options.statusParam">
+            <template v-if="isShowColumnStatusWidget(obj,item)">
+              <span
+              v-if="getTableColumnWidget(obj).options.formScriptEnabled || getTableColumnWidget(obj).options.commonAttributeEnabled"
+              :key="getTableColumnWidget(obj).id+'-'+index">{{ getI18nLabel(item.label) }}</span>
+              <span
+              v-else
+              :key="getTableColumnWidget(obj).id+'-'+index" class="list-tag"
               :class="item.type">{{ getI18nLabel(item.label) }}</span>
+            </template>
           </template>
         </template>
         <component

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -13,6 +13,7 @@ import {
   deepClone,
   loopHandleWidget,
   columnFormatMap,
+  traverseAllWidgetsNew
 } from "../../../../components/xform/utils/util";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
 
@@ -176,12 +177,114 @@ modules = {
   },
   mounted: async function () {
     this.handleOnMounted();
-    this.initTableList();
+    this.initColumnWidgetConfig(()=>{
+      this.initTableList();
+    });
   },
   beforeDestroy: function () {
     this.unregisterFromRefList();
   },
   methods: {
+    getTableColumnWidget(obj){
+      let item = this.fieldSchemaMap[obj.row._X_ROW_KEY];
+      return item ? item[obj.column.params?.widget.id]: null;
+    },
+    isShowColumnStatusWidget(obj,item){
+      let widget = this.getTableColumnWidget(obj);
+      let valueKey = widget.options.valueKey || "value"
+      return obj.row[this.getTableColumnWidgetFieldKeyName(obj)] === item[valueKey]
+    },
+    getTableColumnWidgetFieldKeyName(obj){
+      let widget = this.getTableColumnWidget(obj);
+      return widget ? this.getFieldKeyName(widget): null;
+    },
+    initColumnWidgetConfig(callback){
+      let tableColumns = this.widget.options.tableColumns;
+      let requests = [];
+      this.loodHandleColumns(tableColumns, (row)=>{
+        requests.push(this.handleColumnWidgetConfig(row.widget))
+        requests.push(this.handleColumnWidgetConfig(row.editWidget))
+        let widgetList = row.widgetList;
+        if(widgetList && widgetList.length){
+          traverseAllWidgetsNew(widgetList, (widget)=>{
+            requests.push(this.handleColumnWidgetConfig(widget))
+          })
+        }
+      })
+      if(requests.length){
+        Promise.all(requests).then(()=>{
+          callback()
+        })
+      }else{
+        callback()
+      }
+      
+    },
+    fillColumnWidgetOptionItems(widget,rows){
+      let widgetType = widget.type;
+      let formScriptEnabledTypes = ['select', 'checkbox', 'radio']
+      if(formScriptEnabledTypes.includes(widgetType)){
+        widget.options.optionItems = rows || [];
+      }else if(widgetType=="status"){
+        widget.options.statusParam = rows || [];
+      }
+      widget._syncInited = true;
+    },
+    async handleColumnWidgetConfig(widget,callback){
+      if(!widget)return
+      let widgetType = widget.type;
+      let formScriptEnabledTypes = ['select', 'checkbox', 'radio', 'status']
+      if(!formScriptEnabledTypes.includes(widgetType))return
+      
+      let formScriptEnabled = widget.options.formScriptEnabled || false;
+      let commonAttributeEnabled = widget.options.commonAttributeEnabled || false;
+      let commonAttributeCode = widget.options.commonAttributeCode;
+      if (commonAttributeEnabled) {
+        if (!commonAttributeCode) return;
+      }
+
+      if(!formScriptEnabled && !commonAttributeEnabled)return
+
+      let reportTemplate = this.getFormRef().reportTemplate;
+      let formCode = reportTemplate.formCode;
+      let scriptCode = widget.options.formScriptCode || "getList";
+      let fieldKeyName = this.getFieldKeyName(widget)
+
+      if (formScriptEnabled) {
+          let accessParam = this.handleCustomEvent(
+            widget.options.formScriptParam
+          );
+          return this.formHttp({
+            scriptCode: scriptCode,
+            data: {
+              formCode: formCode,
+              formVersion: reportTemplate.formVersion,
+              taBm: fieldKeyName,
+            data: {
+              ...accessParam,
+            },
+          },
+          success: (res) => {
+            let rows = res.objx || [];
+            this.fillColumnWidgetOptionItems(widget,rows)
+          }
+        });
+      } else if (commonAttributeEnabled) {
+        let accessParam = this.handleCustomEvent(
+          widget.options.formScriptParam
+        );
+        
+         return this.$getBaseDicts({
+          code: commonAttributeCode,
+          data:{
+            ...accessParam
+          },
+          success: ({dicts, dictMap}) => {
+            this.fillColumnWidgetOptionItems(widget,dicts)
+          }
+        });
+      }
+    },
     initConfig() {
       let formRef = this.getFormRef();
       this.widget.options.tableColumns.forEach((row) => {
@@ -626,7 +729,11 @@ modules = {
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
-    initTableList() {
+    async initTableList() {
+
+      
+   
+
       let that = this;
       let path = null;
       let paramFun = null;
@@ -1215,9 +1322,10 @@ modules = {
       let columnLoopDo = (t, e) => {
         callback && callback(t);
         if (t.children && t.children.length) {
-          for (let item of t.children) {
+          this.loodHandleColumns(t.children,callback)
+          /* for (let item of t.children) {
             columnLoopDo(item);
-          }
+          } */
         }
       };
       for (let item of columns) {

package/src/components/xform/mixins/scriptHttp.js

@@ -45,66 +45,66 @@ modules = {
       return this.getFormRef ? this.getFormRef() : this;
     },
     formHttp(opts) {
-      let data = opts.data;
-      let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
-      let formCode = opts.formCode ? opts.formCode.trim() : null;
-      let isLoading = opts.isLoading ?? true;
-      let success = opts.success;
-      let fail = opts.fail;
-      let error = opts.error;
+      return new Promise((resolve, reject) => {
+        let data = opts.data;
+        let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
+        let formCode = opts.formCode ? opts.formCode.trim() : null;
+        let isLoading = opts.isLoading ?? true;
+        let success = opts.success;
+        let fail = opts.fail;
+        let error = opts.error;
 
-      let that = this;
-      let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
-      if (scriptCode && !formCode) {
-        let arr = scriptCode.split("/").filter(item => item)
-        if (arr.length > 1) {
-          formCode = arr[0];
-          scriptCode = arr[1];
+        let that = this;
+        let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+        if (scriptCode && !formCode) {
+          let arr = scriptCode.split("/").filter(item => item)
+          if (arr.length > 1) {
+            formCode = arr[0];
+            scriptCode = arr[1];
+          }
+        }
+        if (!formCode) {
+          formCode = reportTemplate.formCode
         }
-      }
-      if (!formCode) {
-        formCode = reportTemplate.formCode
-      }
 
-      delete opts.data
-      delete opts.scriptCode
-      delete opts.formCode
-      delete opts.isLoading
-      delete opts.success
-      delete opts.fail
-      delete opts.error
+        delete opts.data
+        delete opts.scriptCode
+        delete opts.formCode
+        delete opts.isLoading
+        delete opts.success
+        delete opts.fail
+        delete opts.error
 
 
-      let getServiceName = (callback) => {
+        let getServiceName = (callback) => {
 
-        if (formCode && formCode !== reportTemplate.formCode) {
-          this.getHttpTarget().$http({
-            // aes: true,
-            url: USER_PREFIX + `/formScript/getServiceName`,
-            method: `post`,
-            data: {
-              formCode,
-              scriptCode
-            },
-            isLoading,
-            // loadingTarget: this.getLoadingTarget(),
-            // modalStrictly: true,
-            success: res => {
-              let serviceName = res.objx;
-              if (serviceName) {
-                callback(serviceName)
-              } else {
-                this.$baseAlert("服务名不存在")
+          if (formCode && formCode !== reportTemplate.formCode) {
+            this.getHttpTarget().$http({
+              // aes: true,
+              url: USER_PREFIX + `/formScript/getServiceName`,
+              method: `post`,
+              data: {
+                formCode,
+                scriptCode
+              },
+              isLoading,
+              // loadingTarget: this.getLoadingTarget(),
+              // modalStrictly: true,
+              success: res => {
+                let serviceName = res.objx;
+                if (serviceName) {
+                  callback(serviceName)
+                } else {
+                  this.$baseAlert("服务名不存在")
+                }
               }
-            }
-          });
-        } else {
-          callback(reportTemplate.serviceName)
-        }
+            });
+          } else {
+            callback(reportTemplate.serviceName)
+          }
 
-      }
-      let toDo = () => {
-        return new Promise((resolve, reject) => {
+        }
+        let toDo = () => {
           getServiceName(searviceName => {
             let reqData;
             reqData = data;
@@ -164,15 +164,16 @@ modules = {
               }
             });
           })
-        })
-      }
-      if (opts.isConfirm) {
-        this.$baseConfirm(opts.confirmText).then(() => {
-          return toDo();
-        });
-      } else {
-        return toDo();
-      }
+        }
+        if (opts.isConfirm) {
+          this.$baseConfirm(opts.confirmText).then(() => {
+             toDo();
+          });
+        } else {
+           toDo();
+        }
+      });
+      
     }
   }
 }

package/src/utils/request.js

@@ -182,14 +182,20 @@ function handleCreateInfo(config, res) {
   let data = res.objx;
   if (typeof res.objx === "object") {
     if (Array.isArray(data)) {
-      res.objx.forEach(item => {
+      for(let item of res.objx){
         toDo(item);
-      })
+      }
+      /* res.objx.forEach(item => {
+        toDo(item);
+      }) */
     } else if (data && res.objx.hasOwnProperty("records")) {
       let records = res.objx.records || [];
-      records.forEach(item => {
+      for(let item of records){
+        toDo(item);
+      }
+      /* records.forEach(item => {
         toDo(item);
-      })
+      }) */
     } else {
       toDo(res.objx);
     }
@@ -231,7 +237,18 @@ async function handleNickName2(option) {
     data = res.objx.records;
   }
   let requestData = [];
-  data.forEach(item => {
+  for(let item of data){
+    let createBy = getCreateBy(item);
+    let modifyBy = getModifyBy(item);
+
+    if (createBy && !requestData.includes(createBy)) {
+      requestData.push(createBy)
+    }
+    if (modifyBy && !requestData.includes(modifyBy)) {
+      requestData.push(modifyBy)
+    }
+  }
+  /* data.forEach(item => {
     let createBy = getCreateBy(item);
     let modifyBy = getModifyBy(item);
 
@@ -241,7 +258,7 @@ async function handleNickName2(option) {
     if (modifyBy && !requestData.includes(modifyBy)) {
       requestData.push(modifyBy)
     }
-  })
+  }) */
   if (!requestData.length) {
     callback && callback(res)
     return
@@ -259,7 +276,25 @@ async function handleNickName2(option) {
     isLoading: isLoading,
     success: res2 => {
       let arr = res2.objx || [];
-      data.forEach(item => {
+      for(let item of data){
+        let createBy = getCreateBy(item);
+        let modifyBy = getModifyBy(item);
+        if (createBy) {
+          let obj = arr.find(item => item.loginAccount === createBy);
+          if (obj && obj.nickName) {
+            item._createNickName = obj.nickName;
+            item._createMobile = obj.mobile;
+          }
+        }
+        if (modifyBy) {
+          let obj = arr.find(item => item.loginAccount === modifyBy);
+          if (obj && obj.nickName) {
+            item._modifyNickName = obj.nickName;
+            item._modifyMobile = obj.mobile;
+          }
+        }
+      }
+      /* data.forEach(item => {
         let createBy = getCreateBy(item);
         let modifyBy = getModifyBy(item);
         if (createBy) {
@@ -276,7 +311,7 @@ async function handleNickName2(option) {
             item._modifyMobile = obj.mobile;
           }
         }
-      })
+      }) */
     }
   });
 }