台账导出增加字段

package.json

 {
   "name": "panda-xform",
-  "version": "6.10.30",
-  "description": "6.10.30 电子签名增加水印、地图控件增加切换地图",
+  "version": "6.10.31",
+  "description": "6.10.31 电子签名增加水印、地图控件增加切换地图",
   "keywords": [
     "panda-xform"
   ],

src/core/Account/index.js

@@ -66,6 +66,7 @@ const Account = (props, ref) => {
     defaultType,
     pageSizes,
     isExportRelationForm,
+    isExportImage
   } = props;
   const userID = window?.globalConfig?.userInfo?.OID || 1;
   let initParams = {
@@ -205,7 +206,7 @@ const Account = (props, ref) => {
       content: keys.length > 0 ? `共选择${keys.length}条数据，确定要导出吗` : '确定要导出全部数据吗？',
       onOk: async () => {
         return await new Promise(async (resolve, reject) => {
-          const blob = await ExportAccountData({ accountName: params.accountName, ids: keys.join(','), exportAll, isExportRelationForm: isExportRelationForm === 'true' ? 1 : 0 });
+          const blob = await ExportAccountData({ accountName: params.accountName, ids: keys.join(','), exportAll, isExportRelationForm: isExportRelationForm === 'true' ? 1 : 0, isExportImage: isExportImage === 'true' ? 1 : 0, condition: params?.condition || '' });
           const reader = new FileReader();
           reader.onload = function () {
             const text = reader.result;

src/core/FormDesigner/config/settings.js

@@ -4472,6 +4472,8 @@ const advancedWidgets = [
         default: false,
         displayType: 'row',
         labelWidth: 137,
+        checkedTxt: '显示',
+        unCheckedTxt: '隐藏'
       },
       hiddenCondition: {
         title: '隐藏条件',

src/core/FormRender/index.js

@@ -53,7 +53,6 @@ const XRender = (props, ref) => {
       let ks = Object.keys(k)
       ks.map(x=> fieldDatas[x] =k[x])
     })
-    console.log(fieldDatas, 'datasdatas');
     let parentObj = {}
     let array = []
     if (isObject(parent)) {

src/core/widgets/coord/Coordinate/index.js

@@ -407,7 +407,7 @@ const Coordinate = (props) => {
       }
       <Drag
         width={'80%'}
-        title="选取坐标111"
+        title="选取坐标"
         visible={visible}
         onOk={onOk}
         onCancel={onCancel}

src/core/widgets/select/ComboBox/index.js

@@ -30,7 +30,6 @@ const ComboBox = (props) => {
   const [dictionaryList, setDictionaryList] = useState([])
   const [tableData, setTableData] = useState([])
   const [site, setSite] = useState([])
-  console.log(schema, value, 'ssssaweq');
   useEffect(() => {
     if (addons) {
       addons.setValue(addons.dataPath, presetValue || '')

src/core/widgets/settings/groupBase/IsHidden/index.js

@@ -4,10 +4,13 @@ import { Switch } from 'antd'
 const IsHidden = (props) => {
 
   const { value, onChange, addons } = props
-
+  const { baseControl, checkedTxt, unCheckedTxt  } = props.schema  
   const switchChange = (checked) => {
     if (addons) {
       onChange(checked)
+      // baseControl是否为基础组件，是则不做联动逻辑
+      if(baseControl) return;
+
       if (checked) {
         addons.setValue('hiddenCondition', '1=1')
         addons.setValue('hiddenRules', [])
@@ -21,8 +24,8 @@ const IsHidden = (props) => {
   return (
     <Switch
       checked={value}
-      checkedChildren={'隐藏'}
-      unCheckedChildren={'显示'}
+      checkedChildren={ checkedTxt || '隐藏'}
+      unCheckedChildren={ unCheckedTxt || '显示'}
       onChange={switchChange}
     >
     </Switch>