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

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"
-              :class="item.type">{{ getI18nLabel(item.label) }}</span>
+          <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[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
+              <span
+              v-else
+              :key="getTableColumnWidget(obj).id+'-'+index" class="list-tag"
+              :class="item.type">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</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,126 @@ modules = {
   },
   mounted: async function () {
     this.handleOnMounted();
-    this.initTableList();
+    this.initColumnWidgetConfig(() => {
+      this.initTableList();
+    });
   },
   beforeDestroy: function () {
     this.unregisterFromRefList();
   },
   methods: {
+    getTableColumnStatusWidgetLabelKey(obj) {
+      let widget = this.getTableColumnWidget(obj);
+      return widget ? this.getOptionItemLabelKey(widget) : null;
+    },
+    getOptionItemValueKey(widget) {
+      return widget.options.valueKey || "value";
+    },
+    getOptionItemLabelKey(widget) {
+      return widget.options.labelKey || "label";
+    },
+    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 +741,7 @@ modules = {
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
-    initTableList() {
+    async initTableList() {
       let that = this;
       let path = null;
       let paramFun = null;
@@ -875,14 +990,16 @@ modules = {
 
       let gridPageSize = this.widget.options.gridPageSize;
       let gridPageSizeList = this.widget.options.gridPageSizeList || [];
-      if(!gridPageSizeList || !gridPageSizeList.length){
-        pagerConfig.pageSizes = [50,100,200,500]
-        if(!gridPageSize)gridPageSize = 100
-        pagerConfig.pageSize = gridPageSize
-      }else{
-        pagerConfig.pageSizes = gridPageSizeList.filter(item=>item.value).map(item=>item.value);
-        if(!gridPageSize)gridPageSize = pagerConfig.pageSizes[0]
-        pagerConfig.pageSize = gridPageSize
+      if (!gridPageSizeList || !gridPageSizeList.length) {
+        pagerConfig.pageSizes = [50, 100, 200, 500];
+        if (!gridPageSize) gridPageSize = 100;
+        pagerConfig.pageSize = gridPageSize;
+      } else {
+        pagerConfig.pageSizes = gridPageSizeList
+          .filter((item) => item.value)
+          .map((item) => item.value);
+        if (!gridPageSize) gridPageSize = pagerConfig.pageSizes[0];
+        pagerConfig.pageSize = gridPageSize;
       }
 
       //标题颜色
@@ -1215,9 +1332,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) {
@@ -1500,7 +1618,7 @@ modules = {
         this.removeTreeRow({ row });
         return;
       }
-       delete this.fieldSchemaMap[row._X_ROW_KEY]
+      delete this.fieldSchemaMap[row._X_ROW_KEY];
       let $grid = this.getGridTable();
       $grid.remove(row);
       let tableData = $grid.getTableData();
@@ -1513,46 +1631,60 @@ modules = {
       });
       // this.deleteRowWidgets(row);
     },
-    isSingerlSearch(widget){
+    isSingerlSearch(widget) {
       let widgetType = widget?.type;
-      let result = widgetType === "singerSearch" || (widgetType === 'vabsearch' && !widget.options.multipleChoices)
-      return result
+      let result =
+        widgetType === "singerSearch" ||
+        (widgetType === "vabsearch" && !widget.options.multipleChoices);
+      return result;
     },
-    getColumnNullValue(widget){
-      if(!widget)return null
+    getColumnNullValue(widget) {
+      if (!widget) return null;
       let nullValue = null;
       let widgetType = widget.type;
-      let multiWidgetTypes = ["checkbox","time-range","baseAttachment","vabUpload","project-tag"];
+      let multiWidgetTypes = [
+        "checkbox",
+        "time-range",
+        "baseAttachment",
+        "vabUpload",
+        "project-tag",
+      ];
 
       let defaultValue = widget.options.defaultValue;
-      if (defaultValue !== undefined && defaultValue !== null && defaultValue !== "") {
-          nullValue = defaultValue;
-      } else if (widgetType === 'select' && widget.options.multiple) {
+      if (
+        defaultValue !== undefined &&
+        defaultValue !== null &&
+        defaultValue !== ""
+      ) {
+        nullValue = defaultValue;
+      } else if (widgetType === "select" && widget.options.multiple) {
         nullValue = [];
-      } else if (widgetType === 'date' && widget.options.type == "dates") {
+      } else if (widgetType === "date" && widget.options.type == "dates") {
         nullValue = [];
-      }else if (widgetType === 'vabsearch' && widget.options.multipleChoices) {
+      } else if (widgetType === "vabsearch" && widget.options.multipleChoices) {
         nullValue = [];
-      } else if (multiWidgetTypes.includes(widgetType)){
+      } else if (multiWidgetTypes.includes(widgetType)) {
         nullValue = [];
       }
       return nullValue;
     },
-    getIsFormWidget(widget){
+    getIsFormWidget(widget) {
       let widgetTypes = ["baseAttachment"];
       let result = false;
-      if(widget.formItemFlag){
+      if (widget.formItemFlag) {
         result = true;
       }
       return result;
     },
-    handleWidgetNullValue(widget,newData){
-      if(!widget || !newData)return
-      if(this.getIsFormWidget(widget)){
-        let field = this.getFieldKeyName(widget)
-        let nullValue = newData.hasOwnProperty(field) ? null : this.getColumnNullValue(widget);
+    handleWidgetNullValue(widget, newData) {
+      if (!widget || !newData) return;
+      if (this.getIsFormWidget(widget)) {
+        let field = this.getFieldKeyName(widget);
+        let nullValue = newData.hasOwnProperty(field)
+          ? null
+          : this.getColumnNullValue(widget);
         newData[field] = nullValue;
-        if(this.isSingerlSearch(widget)){
+        if (this.isSingerlSearch(widget)) {
           let vabSearchName = widget.options.vabSearchName;
           if (vabSearchName) newData[vabSearchName] = null;
         }
@@ -1563,28 +1695,27 @@ modules = {
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           let formatS = !isEdit ? item.formatS : item.editFormatS;
-            let widget = null;
-            if(isEdit){
-              widget = item.editWidget || item.widget;
-            }else {
-              widget = item.widget;
+          let widget = null;
+          if (isEdit) {
+            widget = item.editWidget || item.widget;
+          } else {
+            widget = item.widget;
+          }
+          if (formatS == "widgetRender") {
+            if (item.widgetList) {
+              loopHandleWidget(item.widgetList, (w, p) => {
+                this.handleWidgetNullValue(w, newData);
+              });
             }
-            if (formatS == "widgetRender") {
-              if(item.widgetList){
-                loopHandleWidget(item.widgetList, (w, p) => {
-                  this.handleWidgetNullValue(w, newData);
-                });
-              }
-            }else {
-              if(widget){
-                this.handleWidgetNullValue(widget, newData);
-              }else {
-                newData[item.prop] = null
-              }
+          } else {
+            if (widget) {
+              this.handleWidgetNullValue(widget, newData);
+            } else {
+              newData[item.prop] = null;
             }
+          }
         }
       });
-
       /* let vailColumns = this.widget.options.tableColumns.filter(
         (item) => item.prop && item.label
       );
@@ -1764,7 +1895,7 @@ modules = {
       let rowIndex = Math.max(obj.rowIndex, 0);
 
       let propName = fieldKeyName + "." + rowIndex + "." + property;
-      return propName
+      return propName;
     },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
@@ -1775,9 +1906,12 @@ modules = {
       }*/
       let isQueryTable = this.widget.options.isQueryTable || false;
       if (isEdit || !isQueryTable) {
-        let sourceWidgetId = isEdit?obj.column.params.editWidget.id:obj.column.params.widget.id;
-        if(!this.fieldSchemaMap[obj.row._X_ROW_KEY])return "false"
-        let fieldWidget = this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId]
+        let sourceWidgetId = isEdit
+          ? obj.column.params.editWidget.id
+          : obj.column.params.widget.id;
+        if (!this.fieldSchemaMap[obj.row._X_ROW_KEY]) return "false";
+        let fieldWidget =
+          this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId];
         if (!fieldWidget) {
           return "false";
         }
@@ -1786,8 +1920,8 @@ modules = {
         let rowIndex = Math.max(obj.rowIndex, 0);
 
         let property = this.getFieldKeyName(fieldWidget);
-        if(obj.row[property] && Array.isArray(obj.row[property])){
-          return "false"
+        if (obj.row[property] && Array.isArray(obj.row[property])) {
+          return "false";
         }
         // let property = obj.column.property
         if (this.isVabsearchFlagWidget(fieldWidget)) {