2025-05-09

king

2025-05-09 fad2d49a5335dcfccb6b532a4a0053fafb61fa3b

2025-05-09

 src/menu/datasource/verifycard/index.jsx

@@ -723,6 +723,16 @@
      return
    }

    if (type === 'submit' && config.subtype === 'dualdatacard' && setting.subdata === 'sub_data_string' && !columns.find(col => col.field === 'sub_data_string')) {
      notification.warning({
        top: 92,
        message: '主表字段集中需添加 sub_data_string 字段！',
        duration: 5
      })
      reject()
      return
    }

    if (type === 'change' && columns.length === 0) {
      reject()
      return

 src/menu/datasource/verifycard/settingform/index.jsx

@@ -679,7 +679,7 @@
            </Col> : null}
            {config.subtype === 'dualdatacard' ? <Col span={8}>
              <Form.Item label={
                <Tooltip placement="topLeft" title="子表在主表中的数据集名称，使用 sub_data_string 时数据以 JSON 字符串形式返回（字段集中需添加 sub_data_string 字段）。">
                <Tooltip placement="topLeft" title="子表在主表中的数据集名称，使用 sub_data_string 时数据以 JSON 字符串形式返回（字段集中需添加 sub_data_string 字段）；当主表字段存在 sub_data_string 且值不为空时，优先使用主表的 sub_data_string。">
                  <QuestionCircleOutlined className="mk-form-tip" />
                  子表字段
                </Tooltip>

 src/tabviews/custom/components/card/double-data-card/index.jsx

@@ -282,17 +282,18 @@
    if (config.$cache) {
      let getData = (res) => {
        return res.map((item, index) => {
          let _children = item[config.setting.subdata]
          
          delete item[config.setting.subdata]
          if (config.setting.subdata === 'sub_data_string') {
            _children = this.parseSubData(_children)
          } else if (item.sub_data_string) {
            _children = this.parseSubData(item.sub_data_string)
          }

          let children = []

          if (item[config.setting.subdata]) {
            let _children = item[config.setting.subdata]

            delete item[config.setting.subdata]

            if (config.setting.subdata === 'sub_data_string') {
              _children = this.parseSubData(_children)
            }

          if (_children) {
            _children.forEach((cell, i) => {
              cell.key = i
              cell.$$uuid = cell[config.setting.subKey] || ''
@@ -679,16 +680,17 @@
      if (type === 'plus') {
        let _data = (this.state.data || []).concat(result.data || [])
        data = _data.map((item, index) => {
          if (item[config.setting.subdata]) {
            let children = []
            let _children = item[config.setting.subdata]
          let _children = item[config.setting.subdata]
          
          delete item[config.setting.subdata]
          if (config.setting.subdata === 'sub_data_string') {
            _children = this.parseSubData(_children)
          } else if (item.sub_data_string) {
            _children = this.parseSubData(item.sub_data_string)
          }

            delete item[config.setting.subdata]

            if (config.setting.subdata === 'sub_data_string') {
              _children = this.parseSubData(_children)
            }
            
          let children = []
          if (_children) {
            _children.forEach((cell, i) => {
              cell.key = i
              cell.$$uuid = cell[config.setting.subKey] || ''
@@ -701,10 +703,9 @@
                children.push(cell)
              }
            })
            item.children = children
          } else if (!item.children) {
            item.children = []
          }
          
          item.children = children

          item.key = index
          item.$$uuid = item[config.setting.primaryKey] || ''
@@ -722,17 +723,18 @@
        })
      } else {
        data = result.data.map((item, index) => {
          let _children = item[config.setting.subdata]
          
          delete item[config.setting.subdata]
          if (config.setting.subdata === 'sub_data_string') {
            _children = this.parseSubData(_children)
          } else if (item.sub_data_string) {
            _children = this.parseSubData(item.sub_data_string)
          }

          let children = []

          if (item[config.setting.subdata]) {
            let _children = item[config.setting.subdata]

            delete item[config.setting.subdata]

            if (config.setting.subdata === 'sub_data_string') {
              _children = this.parseSubData(_children)
            }

          if (_children) {
            _children.forEach((cell, i) => {
              cell.key = i
              cell.$$uuid = cell[config.setting.subKey] || ''
@@ -852,17 +854,19 @@

        data = data.map(item => {
          if (item.$$uuid === _data.$$uuid) {
            let _children = _data[config.setting.subdata]

            delete _data[config.setting.subdata]

            if (config.setting.subdata === 'sub_data_string') {
              _children = this.parseSubData(_children)
            } else if (_data.sub_data_string) {
              _children = this.parseSubData(_data.sub_data_string)
            }

            let children = []

            if (_data[config.setting.subdata]) {
              let _children = _data[config.setting.subdata]

              delete _data[config.setting.subdata]

              if (config.setting.subdata === 'sub_data_string') {
                _children = this.parseSubData(_children)
              }

            if (_children) {
              _children.forEach((cell, i) => {
                cell.key = i
                cell.$$uuid = cell[config.setting.subKey] || ''